From 071eef95fb582f609186a610c67f538891d4a795 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 4 May 2026 18:04:03 -0600 Subject: [PATCH] replaced log with slog in internal/cache --- internal/cache/fetch.go | 13 ++++++++----- internal/cache/helpers.go | 15 +++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/internal/cache/fetch.go b/internal/cache/fetch.go index a4043f8..e2eed23 100644 --- a/internal/cache/fetch.go +++ b/internal/cache/fetch.go @@ -1,7 +1,8 @@ package cache import ( - "log" + "errors" + "log/slog" "os" "path/filepath" ) @@ -15,8 +16,7 @@ func (c *Cache) Fetch(relPath string) (*CacheFile, error) { // fetch file from upstream _, err, _ = c.sf.Do(relPath, func() (any, error) { - // #log info - log.Print("calling fetch") + slog.Info("calling fetch") return nil, c.fetch(relPath) }) if err != nil { @@ -46,8 +46,11 @@ func (c *Cache) fetch(relPath string) error { if err == nil { break } - // #log warn or info - log.Printf("mirror %s returned %v", url, err) + if upstreamErr, ok := errors.AsType[*UpstreamError](err); ok { + slog.Warn("mirror failed", "url", url, "status", upstreamErr.StatusCode) + } else { + slog.Warn("mirror unreachable", "url", url, "err", err) + } } if err != nil { return err diff --git a/internal/cache/helpers.go b/internal/cache/helpers.go index 3985433..cb88955 100644 --- a/internal/cache/helpers.go +++ b/internal/cache/helpers.go @@ -2,7 +2,7 @@ package cache import ( "io" - "log" + "log/slog" "net/http" "os" ) @@ -13,27 +13,22 @@ func (c *Cache) nextMirror() string { } func downloadToDisk(url, destPath string, c http.Client) error { - // #log info - log.Printf("fetching %v", url) + slog.Info("fetching", "url", url) // set the user agent req, err := http.NewRequest("GET", url, nil) if err != nil { - // #log info - log.Printf("failed to create request: %v", err) - return &UpstreamError{StatusCode: http.StatusInternalServerError} + slog.Error("failed create request", "err", err) } req.Header.Set("User-Agent", userAgent) resp, err := c.Do(req) if err != nil { - // #log warn - log.Printf("error fetching %s: %v", url, err) + slog.Warn("fetch failed", "url", url, "err", err) return err } if resp.StatusCode != 200 { - // #log info - log.Printf("GET %s returned %d", url, resp.StatusCode) + slog.Info("fetch returned", "url", url, "status", resp.StatusCode) return &UpstreamError{StatusCode: resp.StatusCode} } defer resp.Body.Close()