speatzle/nfsense
1
0
Fork 0
mirror of https://github.com/speatzle/nfsense.git synced 2025-09-13 07:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix error log due to slog update

Browse source
This commit is contained in:
Samuel Lorch 2023-05-15 20:22:30 +02:00
parent dd23131976
commit 3fefb7ca7c
7 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/server/api.go
View file

@ -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)
}
}

2
internal/server/server.go
View file

@ -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")
}()

2
internal/server/session.go
View file

@ -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)

8
internal/server/websocket.go
View file

@ -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)
}
}()
}