diff options
Diffstat (limited to 'internal/config')
| -rw-r--r-- | internal/config/config.go | 4 | ||||
| -rw-r--r-- | internal/config/v2/convert.go | 2 | ||||
| -rw-r--r-- | internal/config/v2/v2.go | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/internal/config/config.go b/internal/config/config.go index 9e924c1..06da9b3 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -4,6 +4,7 @@ package config import ( "encoding/json" + "log/slog" "os" "path" @@ -11,7 +12,6 @@ import ( "codeberg.org/eduVPN/eduvpn-common/internal/config/v1" "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" ) @@ -91,7 +91,7 @@ func NewFromDirectory(dir string) *Config { } err := cfg.Load() if err != nil { - log.Logger.Debugf("failed to load configuration: %v", err) + slog.Debug("failed to load configuration", "error", err) } if cfg.V2 == nil { cfg.V2 = &v2.V2{} diff --git a/internal/config/v2/convert.go b/internal/config/v2/convert.go index f50ffaf..675d274 100644 --- a/internal/config/v2/convert.go +++ b/internal/config/v2/convert.go @@ -1,11 +1,11 @@ package v2 import ( + "maps" "time" "codeberg.org/eduVPN/eduvpn-common/internal/config/v1" "codeberg.org/eduVPN/eduvpn-common/types/server" - "maps" ) func v1AuthTime(st time.Time, ost time.Time) time.Time { diff --git a/internal/config/v2/v2.go b/internal/config/v2/v2.go index d23d26d..7851cb8 100644 --- a/internal/config/v2/v2.go +++ b/internal/config/v2/v2.go @@ -4,11 +4,11 @@ package v2 import ( "errors" "fmt" + "log/slog" "net/url" "time" "codeberg.org/eduVPN/eduvpn-common/internal/discovery" - "codeberg.org/eduVPN/eduvpn-common/internal/log" "codeberg.org/eduVPN/eduvpn-common/types/server" ) @@ -215,7 +215,7 @@ func convertCustom(u string) server.Server { dn := u pu, err := url.Parse(u) if err != nil { - log.Logger.Errorf("failed to parse server hostname: %v", err) + slog.Error("failed to parse server hostname", "error", err) } else { dn = pu.Hostname() } @@ -272,7 +272,7 @@ func (cfg *V2) PublicList(disco *discovery.Discovery) *server.List { g.Profiles = v.Profiles ret.Custom = append(ret.Custom, g) default: - log.Logger.Errorf("no such server type in list: '%v'", k.T) + slog.Error("no such server type in list", "type", k.T) continue } } |
