diff options
| author | Max Resnick <max@ofmax.li> | 2025-03-28 23:56:36 -0700 |
|---|---|---|
| committer | Max Resnick <max@ofmax.li> | 2025-03-28 23:56:36 -0700 |
| commit | 07c5566bb837e91ebe9530add9002e39e808eca5 (patch) | |
| tree | 560db8f99593bf0b8c13fe539b0ef56607d44eb2 | |
| parent | 29c0247491e4175af3a1bc43a852a0f753d99d50 (diff) | |
| download | go-git-server-07c5566bb837e91ebe9530add9002e39e808eca5.tar.gz | |
fix: slog error handling
| -rw-r--r-- | cmd/main.go | 6 | ||||
| -rw-r--r-- | internal/admin/service.go | 4 | ||||
| -rw-r--r-- | internal/authz/model.go | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cmd/main.go b/cmd/main.go index f6a15f4..b679e51 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -52,7 +52,7 @@ func main() { if newToken { token, hash, err := authz.GenerateNewToken() if err != nil { - slog.Error("error generating token", err) + slog.Error("error generating token", slog.Any("error", err)) os.Exit(1) } fmt.Printf("token: %s\nhash: %s\n", token, hash) @@ -69,7 +69,7 @@ func main() { tokens := authz.NewTokenMap() err = tokens.LoadTokensFromFile(tokenFilePath) if err != nil { - slog.Error("error generating token", err) + slog.Error("error generating token", slog.Any("error", err)) os.Exit(1) } router := http.NewServeMux() @@ -83,7 +83,7 @@ func main() { ReadHeaderTimeout: 5 * time.Second, Handler: mux, } - slog.Error("error while running exiting", server.ListenAndServe()) + slog.Error("error while running exiting", slog.Any("error", server.ListenAndServe())) os.Exit(1) } diff --git a/internal/admin/service.go b/internal/admin/service.go index f3d705c..6c969ef 100644 --- a/internal/admin/service.go +++ b/internal/admin/service.go @@ -34,10 +34,10 @@ func (s *Servicer) Reload() { s.Conf = tmpConfig slog.Debug("config base after copy", "path", s.Conf.basePath) if err := s.InitServer(); err != nil { - slog.Error("couldn't init server with new config, falling back", err) + slog.Error("couldn't init server with new config, falling back", slog.Any("error", err)) s.Conf = &oldConfig if err := s.InitServer(); err != nil { - slog.Error("couldn't init server with old config, falling back", err) + slog.Error("couldn't init server with old config, falling back", slog.Any("error", err)) panic("new and old config couldn't init server, no available config to run") } slog.Error("server has fallen back to old config but it lives in memory only, in fragile state") diff --git a/internal/authz/model.go b/internal/authz/model.go index 32730c2..c43a159 100644 --- a/internal/authz/model.go +++ b/internal/authz/model.go @@ -25,7 +25,7 @@ func (tm TokenMap) LoadTokensFromFile(path string) error { // TODO this should be configurable contents, err := os.Open(path) if err != nil { - slog.Error("File reading error", err) + slog.Error("File reading error", slog.Any("error", err)) return err } defer contents.Close() |