diff options
Diffstat (limited to 'exports/exports.go')
| -rw-r--r-- | exports/exports.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/exports/exports.go b/exports/exports.go index 448883b..880101a 100644 --- a/exports/exports.go +++ b/exports/exports.go @@ -1,5 +1,3 @@ -// package main implements the main exported API to be used by other languages -// // Some notes: // // - Errors are returned as JSON c strings. The JSON type is defined in `types/error/error.go Error`. Free them using `FreeString`. Same is the case for other string types, you should also free them. The errors are always localized @@ -23,12 +21,12 @@ import ( "context" "encoding/json" "fmt" + "log/slog" "runtime/cgo" "unsafe" "codeberg.org/eduVPN/eduvpn-common/client" "codeberg.org/eduVPN/eduvpn-common/i18nerr" - "codeberg.org/eduVPN/eduvpn-common/internal/log" "codeberg.org/eduVPN/eduvpn-common/types/cookie" errtypes "codeberg.org/eduVPN/eduvpn-common/types/error" srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" @@ -84,7 +82,7 @@ func stateCallback( newStateC := C.int(newState) d, err := getReturnData(data) if err != nil { - log.Logger.Errorf("failed to get return data: %v", err) + slog.Error("cgo failed to get return data", "error", err) return false } dataC := C.CString(d) @@ -982,7 +980,7 @@ func SetTokenHandler(getter C.TokenGetter, setter C.TokenSetter) *C.char { state.TokenSetter = func(sid string, stype srvtypes.Type, t srvtypes.Tokens) { tJSON, err := getReturnData(t) if err != nil { - log.Logger.Warningf("failed to get tokens for setting tokens in exports: %v", err) + slog.Warn("cgo failed to get tokens in setting tokens callback", "error", err) return } c1 := C.CString(sid) @@ -1004,20 +1002,20 @@ func SetTokenHandler(getter C.TokenGetter, setter C.TokenSetter) *C.char { // get null pointer index as unmarshalling wants it without null := bytes.IndexByte(d, 0) if null < 0 { - log.Logger.Warningf("output buffer is not NULL terminated") + slog.Warn("cgo output buffer in token getter is not null terminated") return nil } // no data found if null == 0 { - log.Logger.Debugf("empty string returned when getting tokens") + slog.Warn("cgo empty string returned in token getter") return nil } var gotT srvtypes.Tokens err := json.Unmarshal(d[:null], &gotT) if err != nil { - log.Logger.Warningf("failed to get JSON data for getting tokens in exports: %v", err) + slog.Warn("cgo failed to get JSON data in token getter", "error", err) return nil } return &gotT |