summaryrefslogtreecommitdiff
path: root/internal/config/v2
diff options
context:
space:
mode:
authorJeroen Wijenbergh <jeroen.wijenbergh@geant.org>2025-05-06 14:33:54 +0200
committerJeroen Wijenbergh <jeroen.wijenbergh@geant.org>2025-05-06 15:40:55 +0200
commit3f0c2643b4caadd3a47201caa2c6acba2585241d (patch)
treecd6af32500156184d74d28c1476d18f33dbdee33 /internal/config/v2
parent15bef1fca407c21eed5d2c433051042c728468e6 (diff)
All: Move to log/slog
Diffstat (limited to 'internal/config/v2')
-rw-r--r--internal/config/v2/convert.go2
-rw-r--r--internal/config/v2/v2.go6
2 files changed, 4 insertions, 4 deletions
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
}
}