From 07af692ecb1a9cabf03af1575dff7a82cf18a7ac Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 18 Sep 2023 12:04:59 +0300 Subject: refactor(tvix/nar-bridge): simplify CLI interface Only keep the `serve` subcommand, and make it appear at the root. Introduce a --log-level argument, and be a bit less noisy in normal operation. Change-Id: I86b8abde1869a5c0c947508bcc29f845222aac09 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9360 Autosubmit: flokli Reviewed-by: Connor Brewster Tested-by: BuildkiteCI --- tvix/nar-bridge/pkg/server/blob_upload.go | 2 +- tvix/nar-bridge/pkg/server/directory_upload.go | 2 +- tvix/nar-bridge/pkg/server/nar_get.go | 9 +++------ tvix/nar-bridge/pkg/server/nar_put.go | 2 +- tvix/nar-bridge/pkg/server/narinfo_put.go | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) (limited to 'tvix/nar-bridge/pkg/server') diff --git a/tvix/nar-bridge/pkg/server/blob_upload.go b/tvix/nar-bridge/pkg/server/blob_upload.go index 82e22864a552..cfb65eddb14a 100644 --- a/tvix/nar-bridge/pkg/server/blob_upload.go +++ b/tvix/nar-bridge/pkg/server/blob_upload.go @@ -64,7 +64,7 @@ func genBlobServiceWriteCb(ctx context.Context, blobServiceClient storev1pb.Blob log.WithFields(log.Fields{ "blob_digest": base64.StdEncoding.EncodeToString(resp.GetDigest()), "blob_size": blobSize, - }).Info("uploaded blob") + }).Debug("uploaded blob") return nil } diff --git a/tvix/nar-bridge/pkg/server/directory_upload.go b/tvix/nar-bridge/pkg/server/directory_upload.go index 02b173698042..d679d3c0b31d 100644 --- a/tvix/nar-bridge/pkg/server/directory_upload.go +++ b/tvix/nar-bridge/pkg/server/directory_upload.go @@ -44,7 +44,7 @@ func (du *DirectoriesUploader) Put(directory *storev1pb.Directory) error { if err != nil { return fmt.Errorf("error sending directory: %w", err) } - log.WithField("digest", base64.StdEncoding.EncodeToString(directoryDgst)).Info("uploaded directory") + log.WithField("digest", base64.StdEncoding.EncodeToString(directoryDgst)).Debug("uploaded directory") return nil } diff --git a/tvix/nar-bridge/pkg/server/nar_get.go b/tvix/nar-bridge/pkg/server/nar_get.go index d1a9426f33d4..b1eb70b624f0 100644 --- a/tvix/nar-bridge/pkg/server/nar_get.go +++ b/tvix/nar-bridge/pkg/server/nar_get.go @@ -85,8 +85,7 @@ func renderNar( return fmt.Errorf("unable to calculate directory digest: %w", err) } - // TODO: debug level - log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDgst)).Info("received directory node") + log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDgst)).Debug("received directory node") directories[hex.EncodeToString(directoryDgst)] = directory } @@ -98,8 +97,7 @@ func renderNar( w, pathInfo, func(directoryDigest []byte) (*storev1pb.Directory, error) { - // TODO: debug level - log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDigest)).Info("Get directory") + log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDigest)).Debug("Get directory") directoryRefStr := hex.EncodeToString(directoryDigest) directory, found := directories[directoryRefStr] if !found { @@ -113,8 +111,7 @@ func renderNar( return directory, nil }, func(blobDigest []byte) (io.ReadCloser, error) { - // TODO: debug level - log.WithField("blob", base64.StdEncoding.EncodeToString(blobDigest)).Info("Get blob") + log.WithField("blob", base64.StdEncoding.EncodeToString(blobDigest)).Debug("Get blob") resp, err := blobServiceClient.Read(ctx, &storev1pb.ReadBlobRequest{ Digest: blobDigest, }) diff --git a/tvix/nar-bridge/pkg/server/nar_put.go b/tvix/nar-bridge/pkg/server/nar_put.go index 6d8b2bbd41ca..aecad571cdaa 100644 --- a/tvix/nar-bridge/pkg/server/nar_put.go +++ b/tvix/nar-bridge/pkg/server/nar_put.go @@ -60,7 +60,7 @@ func registerNarPut(s *Server) { return } - log.Infof("closing the stream") + log.Debug("closing the stream") // Close the directories uploader directoriesPutResponse, err := directoriesUploader.Done() diff --git a/tvix/nar-bridge/pkg/server/narinfo_put.go b/tvix/nar-bridge/pkg/server/narinfo_put.go index c5b4094f8582..1ad85d8a8bcb 100644 --- a/tvix/nar-bridge/pkg/server/narinfo_put.go +++ b/tvix/nar-bridge/pkg/server/narinfo_put.go @@ -167,7 +167,7 @@ func registerNarinfoPut(s *Server) { return } - log.Infof("received new pathInfo: %v+", receivedPathInfo) + log.Debugf("received new pathInfo: %v+", receivedPathInfo) // TODO: update the local temporary pathinfo with this? }) -- cgit 1.4.1