From 07c5566bb837e91ebe9530add9002e39e808eca5 Mon Sep 17 00:00:00 2001 From: Max Resnick Date: Fri, 28 Mar 2025 23:56:36 -0700 Subject: fix: slog error handling --- internal/admin/service.go | 4 ++-- internal/authz/model.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'internal') 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() -- cgit v1.2.3