about summary refs log tree commit diff
path: root/tvix/nar-bridge
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-09-18T09·03+0300
committerflokli <flokli@flokli.de>2023-09-18T14·02+0000
commitdd7cc6ed689d01d14588ec09202b5aae5fb5c9a8 (patch)
treefd9a600fffa29132b9d94fca481fc217fa3b49f9 /tvix/nar-bridge
parent749ab6721634c18ba9867d77e9e6d0e9860b6990 (diff)
fix(tvix/nar-bridge): don't log error on simple 404s r/6612
`nix copy` checks if NARs and NARInfo files are present, before
uploading them. That's not an error, but normal behaviour, so no need to
log with level info for these cases.

We only want to log if the error is not a 404, and log with Warn level.

Change-Id: I762de3b862d070a0f18bc62e324e94ca5c7c3693
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9359
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/nar-bridge')
-rw-r--r--tvix/nar-bridge/pkg/server/nar_get.go2
-rw-r--r--tvix/nar-bridge/pkg/server/narinfo_get.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/tvix/nar-bridge/pkg/server/nar_get.go b/tvix/nar-bridge/pkg/server/nar_get.go
index c8c35e69ff..d1a9426f33 100644
--- a/tvix/nar-bridge/pkg/server/nar_get.go
+++ b/tvix/nar-bridge/pkg/server/nar_get.go
@@ -171,10 +171,10 @@ func registerNarGet(s *Server) {
 
 		err = renderNar(ctx, log, s.directoryServiceClient, s.blobServiceClient, &s.narHashToPathInfoMu, s.narHashToPathInfo, w, narHash, true)
 		if err != nil {
-			log.WithError(err).Info("unable to render nar")
 			if errors.Is(err, fs.ErrNotExist) {
 				w.WriteHeader(http.StatusNotFound)
 			} else {
+				log.WithError(err).Warn("unable to render nar")
 				w.WriteHeader(http.StatusInternalServerError)
 			}
 		}
diff --git a/tvix/nar-bridge/pkg/server/narinfo_get.go b/tvix/nar-bridge/pkg/server/narinfo_get.go
index 977e113613..ec850670b4 100644
--- a/tvix/nar-bridge/pkg/server/narinfo_get.go
+++ b/tvix/nar-bridge/pkg/server/narinfo_get.go
@@ -135,10 +135,10 @@ func registerNarinfoGet(s *Server) {
 
 		err = renderNarinfo(ctx, log, s.pathInfoServiceClient, &s.narHashToPathInfoMu, s.narHashToPathInfo, outputHash, w, false)
 		if err != nil {
-			log.WithError(err).Info("unable to render narinfo")
 			if errors.Is(err, fs.ErrNotExist) {
 				w.WriteHeader(http.StatusNotFound)
 			} else {
+				log.WithError(err).Warn("unable to render narinfo")
 				w.WriteHeader(http.StatusInternalServerError)
 			}
 		}