All: Move to log/slog

2 files changed, 14 insertions, 15 deletions

diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go
index 3fcb68c..81163f8 100644
--- a/internal/discovery/discovery.go
+++ b/internal/discovery/discovery.go
@@ -6,12 +6,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"time"
 
 	httpw "codeberg.org/eduVPN/eduvpn-common/internal/http"
 	"codeberg.org/eduVPN/eduvpn-common/internal/levenshtein"
-	"codeberg.org/eduVPN/eduvpn-common/internal/log"
 	"codeberg.org/eduVPN/eduvpn-common/internal/verify"
 	discotypes "codeberg.org/eduVPN/eduvpn-common/types/discovery"
 )
@@ -129,13 +129,13 @@ func (discovery *Discovery) file(ctx context.Context, jsonFile string, previousV
 	if lms != "" {
 		lm, err := http.ParseTime(lms)
 		if err != nil {
-			log.Logger.Warningf("failed to parse 'Last-Modified' header: %v", err)
+			slog.Warn("failed to parse 'Last-Modified' header", "error", err)
 		} else {
 			newUpdate = lm
-			log.Logger.Debugf("got 'Last-Modified' header: %v", lm)
+			slog.Debug("got 'Last-Modified' header", "value", lm)
 		}
 	} else {
-		log.Logger.Warningf("no 'Last-Modified' header found")
+		slog.Warn("no 'Last-Modified' header found")
 	}
 
 	// Get signature
@@ -339,22 +339,22 @@ func (discovery *Discovery) Organizations(ctx context.Context) (*Organizations,
 		statErr := &httpw.StatusError{}
 		if errors.As(err, &statErr) {
 			if statErr.Status != 304 {
-				log.Logger.Warningf("failed to get fresh organizations: %v", err)
+				slog.Warn("failed to get fresh organization", "error", err)
 			} else {
 				discovery.OrganizationList.Timestamp = time.Now()
-				log.Logger.Debugf("got 304 for discovery, organization_list.json not modified")
+				slog.Debug("got HTTP 304 for discovery, organization_list.json is not modified")
 				err = nil
 			}
 		}
 		// Return previous with an error
 		orgs, perr := discovery.previousOrganizations()
 		if perr != nil {
-			log.Logger.Warningf("failed to get previous discovery organizations: %v", perr)
+			slog.Warn("failed to get previous discovery organizations", "error", perr)
 		}
 		return orgs, false, err
 	}
 	if len(jsonDecode.List) == 0 {
-		log.Logger.Warningf("fresh organization list is empty")
+		slog.Warn("fresh organization list is empty")
 	} else {
 		discovery.OrganizationList = jsonDecode
 	}
@@ -379,22 +379,22 @@ func (discovery *Discovery) Servers(ctx context.Context) (*Servers, bool, error)
 		statErr := &httpw.StatusError{}
 		if errors.As(err, &statErr) {
 			if statErr.Status != 304 {
-				log.Logger.Warningf("failed to get fresh servers: %v", err)
+				slog.Warn("failed to get fresh servers", "error", err)
 			} else {
 				discovery.ServerList.Timestamp = time.Now()
-				log.Logger.Debugf("got 304 for discovery, server_list.json not modified")
+				slog.Debug("got HTTP 304 for discovery, server_list.json is not modified")
 				err = nil
 			}
 		}
 		// Return previous with an error
 		srvs, perr := discovery.previousServers()
 		if perr != nil {
-			log.Logger.Warningf("failed to get previous discovery servers: %v", perr)
+			slog.Warn("failed to get previous discovery server", "error", perr)
 		}
 		return srvs, false, err
 	}
 	if len(jsonDecode.List) == 0 {
-		log.Logger.Warningf("fresh server list is empty")
+		slog.Warn("fresh server list is empty")
 	} else {
 		discovery.ServerList = jsonDecode
 	}
diff --git a/internal/discovery/manager.go b/internal/discovery/manager.go
index 6a78486..134525b 100644
--- a/internal/discovery/manager.go
+++ b/internal/discovery/manager.go
@@ -2,9 +2,8 @@ package discovery
 
 import (
 	"context"
+	"log/slog"
 	"sync"
-
-	"codeberg.org/eduVPN/eduvpn-common/internal/log"
 )
 
 // Manager is the discovery struct that is cached
@@ -68,7 +67,7 @@ func (m *Manager) Startup(ctx context.Context, cb func()) {
 		m.lock(false)
 		discoCopy, err := m.disco.Copy()
 		if err != nil {
-			log.Logger.Warningf("internal error, failed to clone discovery, %v", err)
+			slog.Warn("failed to clone discovery", "error", err)
 			return
 		}
 		m.unlock(false)