mirror of
https://github.com/wailsapp/wails.git
synced 2025-05-02 17:39:58 +08:00
[linux] better error handling
This commit is contained in:
parent
be15644b96
commit
a624ee5e35
@ -23,6 +23,7 @@ import "C"
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
@ -344,22 +345,23 @@ func (f *Frontend) processRequest(request unsafe.Pointer) {
|
|||||||
content, mimeType, err := f.assets.Load(file)
|
content, mimeType, err := f.assets.Load(file)
|
||||||
|
|
||||||
// TODO How to return 404/500 errors to webkit?
|
// TODO How to return 404/500 errors to webkit?
|
||||||
//if err != nil {
|
if err != nil {
|
||||||
//if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
// f.dispatch(func() {
|
message := C.CString("File not found")
|
||||||
// message := C.CString("not found")
|
gerr := C.g_error_new_literal(C.g_quark_from_string(message), C.int(404), message)
|
||||||
// defer C.free(unsafe.Pointer(message))
|
C.webkit_uri_scheme_request_finish_error(req, gerr)
|
||||||
// C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(404), message))
|
C.g_error_free(gerr)
|
||||||
// })
|
C.free(unsafe.Pointer(message))
|
||||||
//} else {
|
} else {
|
||||||
// err = fmt.Errorf("Error processing request %s: %w", uri, err)
|
err = fmt.Errorf("Error processing request %s: %v", uri, err)
|
||||||
// f.logger.Error(err.Error())
|
message := C.CString("Internal Error")
|
||||||
// message := C.CString("internal server error")
|
gerr := C.g_error_new_literal(C.g_quark_from_string(message), C.int(500), message)
|
||||||
// defer C.free(unsafe.Pointer(message))
|
C.webkit_uri_scheme_request_finish_error(req, gerr)
|
||||||
// C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(500), message))
|
C.g_error_free(gerr)
|
||||||
//}
|
C.free(unsafe.Pointer(message))
|
||||||
//return
|
}
|
||||||
//}
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cContent := C.CString(string(content))
|
cContent := C.CString(string(content))
|
||||||
defer C.free(unsafe.Pointer(cContent))
|
defer C.free(unsafe.Pointer(cContent))
|
||||||
|
Loading…
Reference in New Issue
Block a user