From 3fefb7ca7c42006b4e13d6a152e9b5441494cd69 Mon Sep 17 00:00:00 2001 From: Samuel Lorch Date: Mon, 15 May 2023 20:22:30 +0200 Subject: [PATCH] fix error log due to slog update --- internal/config/apply.go | 4 ++-- internal/jsonrpc/handler.go | 6 +++--- internal/server/api.go | 4 ++-- internal/server/server.go | 2 +- internal/server/session.go | 2 +- internal/server/websocket.go | 8 ++++---- main.go | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/internal/config/apply.go b/internal/config/apply.go index 62aff05..e5b916e 100644 --- a/internal/config/apply.go +++ b/internal/config/apply.go @@ -15,10 +15,10 @@ func (m *ConfigManager) ApplyPendingChanges() error { for _, fn := range m.applyFunctions { err := fn(*m.currentConfig, *m.pendingConfig) if err != nil { - slog.Error("Applying Pending Changes", err) + slog.Error("Applying Pending Changes", "err", err) err2 := revertToCurrent(m) if err2 != nil { - slog.Error("Reverting Error", err2) + slog.Error("Reverting Error", "err", err2) return fmt.Errorf("Apply Error %w; Reverting Error %w", err, err2) } return err diff --git a/internal/jsonrpc/handler.go b/internal/jsonrpc/handler.go index 278d3cc..d047895 100644 --- a/internal/jsonrpc/handler.go +++ b/internal/jsonrpc/handler.go @@ -29,7 +29,7 @@ func NewHandler(maxRequestSize int64) *Handler { func (h *Handler) HandleRequest(ctx context.Context, s *session.Session, r io.Reader, w io.Writer) error { defer func() { if r := recover(); r != nil { - slog.Error("Recovered Panic Handling JSONRPC Request", fmt.Errorf("%v", r), "stack", debug.Stack()) + slog.Error("Recovered Panic Handling JSONRPC Request", "err", fmt.Errorf("%v", r), "stack", debug.Stack()) } }() var req request @@ -81,7 +81,7 @@ func (h *Handler) HandleRequest(ctx context.Context, s *session.Session, r io.Re defer func() { if r := recover(); r != nil { - slog.Error("Recovered Panic Executing API Method", fmt.Errorf("%v", r), "method", req.Method, "params", fmt.Sprintf("%+v", params[2]), "id", req.ID, "stack", debug.Stack()) + slog.Error("Recovered Panic Executing API Method", "err", fmt.Errorf("%v", r), "method", req.Method, "params", fmt.Sprintf("%+v", params[2]), "id", req.ID, "stack", debug.Stack()) respondError(w, req.ID, ErrInternalError, fmt.Errorf("%v", r)) } }() @@ -90,7 +90,7 @@ func (h *Handler) HandleRequest(ctx context.Context, s *session.Session, r io.Re if !res[1].IsNil() { reqerr := res[1].Interface().(error) - slog.Error("API Method", reqerr, "method", req.Method, "id", req.ID, "params", fmt.Sprintf("%+v", params[2])) + slog.Error("API Method", "err", reqerr, "method", req.Method, "id", req.ID, "params", fmt.Sprintf("%+v", params[2])) respondError(w, req.ID, ErrInternalError, reqerr) return nil } diff --git a/internal/server/api.go b/internal/server/api.go index a41ac5c..72dff3f 100644 --- a/internal/server/api.go +++ b/internal/server/api.go @@ -20,7 +20,7 @@ func HandleAPI(w http.ResponseWriter, r *http.Request) { defer func() { if r := recover(); r != nil { - slog.Error("Recovered Panic Handling HTTP API Request", fmt.Errorf("%v", r), "stack", debug.Stack()) + slog.Error("Recovered Panic Handling HTTP API Request", "err", fmt.Errorf("%v", r), "stack", debug.Stack()) http.Error(w, "Internal Server Error", http.StatusInternalServerError) return } @@ -30,6 +30,6 @@ func HandleAPI(w http.ResponseWriter, r *http.Request) { err := apiHandler.HandleRequest(ctx, s, r.Body, w) if err != nil { - slog.Error("Handling HTTP API Request", err) + slog.Error("Handling HTTP API Request", "err", err) } } diff --git a/internal/server/server.go b/internal/server/server.go index 19f7d39..90d0788 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -39,7 +39,7 @@ func StartWebserver(_configManager *config.ConfigManager, _apiHandler *jsonrpc.H go func() { if err := server.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) { - slog.Error("Webserver error", err) + slog.Error("Webserver error", "err", err) } slog.Info("Webserver Stopped") }() diff --git a/internal/server/session.go b/internal/server/session.go index 4cc4bf7..6635625 100644 --- a/internal/server/session.go +++ b/internal/server/session.go @@ -25,7 +25,7 @@ func HandleLogin(w http.ResponseWriter, r *http.Request) { var req LoginRequest err = json.Unmarshal(buf, &req) if err != nil { - slog.Error("Unmarshal", err) + slog.Error("Unmarshal", "err", err) return } err = auth.AuthenticateUser(configManager.GetCurrentConfig(), req.Username, req.Password) diff --git a/internal/server/websocket.go b/internal/server/websocket.go index e0e80e6..bce283d 100644 --- a/internal/server/websocket.go +++ b/internal/server/websocket.go @@ -24,7 +24,7 @@ func HandleWebsocketAPI(w http.ResponseWriter, r *http.Request) { defer cancel() c, err := websocket.Accept(w, r, nil) if err != nil { - slog.Error("Accepting Websocket Connection", err) + slog.Error("Accepting Websocket Connection", "err", err) return } defer c.Close(websocket.StatusInternalError, "Unexpected Closing") @@ -38,14 +38,14 @@ func HandleWebsocketAPI(w http.ResponseWriter, r *http.Request) { cancel() return } else if err != nil { - slog.Error("API Websocket Closed Unexpectedly", err) + slog.Error("API Websocket Closed Unexpectedly", "err", err) cancel() } go func() { defer func() { if r := recover(); r != nil { - slog.Error("Recovered Panic Handling Websocket API Request", fmt.Errorf("%v", r), "stack", debug.Stack()) + slog.Error("Recovered Panic Handling Websocket API Request", "err", fmt.Errorf("%v", r), "stack", debug.Stack()) return } }() @@ -54,7 +54,7 @@ func HandleWebsocketAPI(w http.ResponseWriter, r *http.Request) { err := apiHandler.HandleRequest(ctx, s, bytes.NewReader(m), w) if err != nil { - slog.Error("Handling Websocket API Request", err) + slog.Error("Handling Websocket API Request", "err", err) } }() } diff --git a/main.go b/main.go index e0c25bd..963835e 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ func main() { dbusConn, err := dbus.ConnectSystemBus() if err != nil { - slog.Error("Connecting to DBus", err) + slog.Error("Connecting to DBus", "err", err) // os.Exit(1) } defer dbusConn.Close() @@ -55,7 +55,7 @@ func main() { err = configManager.LoadCurrentConfigFromDisk() if err != nil { - slog.Error("Loading Current Config", err) + slog.Error("Loading Current Config", "err", err) os.Exit(1) } @@ -68,7 +68,7 @@ func main() { } err = configManager.DiscardPendingConfig() if err != nil { - slog.Error("Discarding Pending Config", err) + slog.Error("Discarding Pending Config", "err", err) os.Exit(1) } } @@ -77,7 +77,7 @@ func main() { slog.Info("Applying Config...") err := configManager.ApplyPendingChanges() if err != nil { - slog.Error("Applying Pending Config", err) + slog.Error("Applying Pending Config", "err", err) os.Exit(1) } slog.Info("Config Applied, Exiting...")