replaced log with slog in internal/cache
This commit is contained in:
Vendored
+8
-5
@@ -1,7 +1,8 @@
|
|||||||
package cache
|
package cache
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"errors"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
)
|
)
|
||||||
@@ -15,8 +16,7 @@ func (c *Cache) Fetch(relPath string) (*CacheFile, error) {
|
|||||||
|
|
||||||
// fetch file from upstream
|
// fetch file from upstream
|
||||||
_, err, _ = c.sf.Do(relPath, func() (any, error) {
|
_, err, _ = c.sf.Do(relPath, func() (any, error) {
|
||||||
// #log info
|
slog.Info("calling fetch")
|
||||||
log.Print("calling fetch")
|
|
||||||
return nil, c.fetch(relPath)
|
return nil, c.fetch(relPath)
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -46,8 +46,11 @@ func (c *Cache) fetch(relPath string) error {
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
// #log warn or info
|
if upstreamErr, ok := errors.AsType[*UpstreamError](err); ok {
|
||||||
log.Printf("mirror %s returned %v", url, err)
|
slog.Warn("mirror failed", "url", url, "status", upstreamErr.StatusCode)
|
||||||
|
} else {
|
||||||
|
slog.Warn("mirror unreachable", "url", url, "err", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
Vendored
+5
-10
@@ -2,7 +2,7 @@ package cache
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"io"
|
"io"
|
||||||
"log"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
@@ -13,27 +13,22 @@ func (c *Cache) nextMirror() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func downloadToDisk(url, destPath string, c http.Client) error {
|
func downloadToDisk(url, destPath string, c http.Client) error {
|
||||||
// #log info
|
slog.Info("fetching", "url", url)
|
||||||
log.Printf("fetching %v", url)
|
|
||||||
|
|
||||||
// set the user agent
|
// set the user agent
|
||||||
req, err := http.NewRequest("GET", url, nil)
|
req, err := http.NewRequest("GET", url, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// #log info
|
slog.Error("failed create request", "err", err)
|
||||||
log.Printf("failed to create request: %v", err)
|
|
||||||
return &UpstreamError{StatusCode: http.StatusInternalServerError}
|
|
||||||
}
|
}
|
||||||
req.Header.Set("User-Agent", userAgent)
|
req.Header.Set("User-Agent", userAgent)
|
||||||
|
|
||||||
resp, err := c.Do(req)
|
resp, err := c.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// #log warn
|
slog.Warn("fetch failed", "url", url, "err", err)
|
||||||
log.Printf("error fetching %s: %v", url, err)
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if resp.StatusCode != 200 {
|
if resp.StatusCode != 200 {
|
||||||
// #log info
|
slog.Info("fetch returned", "url", url, "status", resp.StatusCode)
|
||||||
log.Printf("GET %s returned %d", url, resp.StatusCode)
|
|
||||||
return &UpstreamError{StatusCode: resp.StatusCode}
|
return &UpstreamError{StatusCode: resp.StatusCode}
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|||||||
Reference in New Issue
Block a user