aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorMax Resnick <max@ofmax.li>2025-03-28 23:56:36 -0700
committerMax Resnick <max@ofmax.li>2025-03-28 23:56:36 -0700
commit07c5566bb837e91ebe9530add9002e39e808eca5 (patch)
tree560db8f99593bf0b8c13fe539b0ef56607d44eb2 /internal
parent29c0247491e4175af3a1bc43a852a0f753d99d50 (diff)
downloadgo-git-server-07c5566bb837e91ebe9530add9002e39e808eca5.tar.gz
fix: slog error handling
Diffstat (limited to 'internal')
-rw-r--r--internal/admin/service.go4
-rw-r--r--internal/authz/model.go2
2 files changed, 3 insertions, 3 deletions
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()