diff options
| author | Jeroen Wijenbergh <jeroen.wijenbergh@geant.org> | 2025-05-06 14:33:54 +0200 |
|---|---|---|
| committer | Jeroen Wijenbergh <jeroen.wijenbergh@geant.org> | 2025-05-06 15:40:55 +0200 |
| commit | 3f0c2643b4caadd3a47201caa2c6acba2585241d (patch) | |
| tree | cd6af32500156184d74d28c1476d18f33dbdee33 /internal/server | |
| parent | 15bef1fca407c21eed5d2c433051042c728468e6 (diff) | |
All: Move to log/slog
Diffstat (limited to 'internal/server')
| -rw-r--r-- | internal/server/custom.go | 4 | ||||
| -rw-r--r-- | internal/server/institute.go | 4 | ||||
| -rw-r--r-- | internal/server/secureinternet.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/internal/server/custom.go b/internal/server/custom.go index fe240e7..0940084 100644 --- a/internal/server/custom.go +++ b/internal/server/custom.go @@ -2,11 +2,11 @@ package server import ( "context" + "log/slog" "time" "codeberg.org/eduVPN/eduvpn-common/internal/api" "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" - "codeberg.org/eduVPN/eduvpn-common/internal/log" "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) @@ -45,7 +45,7 @@ func (s *Servers) AddCustom(ctx context.Context, id string, ot *int64) error { // authorization has failed, remove the server again rerr := s.config.RemoveServer(id, server.TypeCustom) if rerr != nil { - log.Logger.Warningf("could not remove custom server: '%s' after failing authorization: %v", id, rerr) + slog.Warn("could not remove custom server after failing authorization", "server", id, "error", rerr) } return err } diff --git a/internal/server/institute.go b/internal/server/institute.go index 8948443..348e895 100644 --- a/internal/server/institute.go +++ b/internal/server/institute.go @@ -2,12 +2,12 @@ package server import ( "context" + "log/slog" "time" "codeberg.org/eduVPN/eduvpn-common/internal/api" "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" "codeberg.org/eduVPN/eduvpn-common/internal/discovery" - "codeberg.org/eduVPN/eduvpn-common/internal/log" "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) @@ -57,7 +57,7 @@ func (s *Servers) AddInstitute(ctx context.Context, discom *discovery.Manager, i // authorization has failed, remove the server again rerr := s.config.RemoveServer(dsrv.BaseURL, server.TypeInstituteAccess) if rerr != nil { - log.Logger.Warningf("could not remove institute access server: '%s' after failing authorization: %v", dsrv.BaseURL, rerr) + slog.Warn("Could not remove institute access server after failing authorization", "server", dsrv.BaseURL, "error", rerr) } return err } diff --git a/internal/server/secureinternet.go b/internal/server/secureinternet.go index 1b786ed..f97cef1 100644 --- a/internal/server/secureinternet.go +++ b/internal/server/secureinternet.go @@ -3,12 +3,12 @@ package server import ( "context" "errors" + "log/slog" "time" "codeberg.org/eduVPN/eduvpn-common/internal/api" "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" "codeberg.org/eduVPN/eduvpn-common/internal/discovery" - "codeberg.org/eduVPN/eduvpn-common/internal/log" "codeberg.org/eduVPN/eduvpn-common/internal/util" "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" @@ -76,7 +76,7 @@ func (s *Servers) AddSecure(ctx context.Context, discom *discovery.Manager, orgI // authorization has failed, remove the server again rerr := s.config.RemoveServer(orgID, server.TypeSecureInternet) if rerr != nil { - log.Logger.Warningf("could not remove secure internet server: '%s' after failing authorization: %v", orgID, rerr) + slog.Warn("could not remove secure internet server after failing authorization", "server", orgID, "error", rerr) } return err } |