diff options
author | Florian Klink <flokli@flokli.de> | 2023-09-18T09·04+0300 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-09-18T14·02+0000 |
commit | 07af692ecb1a9cabf03af1575dff7a82cf18a7ac (patch) | |
tree | 7972e3eb3969774098ec0bcc71867e33d488130e /tvix/nar-bridge/cmd/nar_bridge/serve.go | |
parent | dd7cc6ed689d01d14588ec09202b5aae5fb5c9a8 (diff) |
refactor(tvix/nar-bridge): simplify CLI interface r/6613
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 <flokli@flokli.de> Reviewed-by: Connor Brewster <cbrewster@hey.com> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/nar-bridge/cmd/nar_bridge/serve.go')
-rw-r--r-- | tvix/nar-bridge/cmd/nar_bridge/serve.go | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/tvix/nar-bridge/cmd/nar_bridge/serve.go b/tvix/nar-bridge/cmd/nar_bridge/serve.go deleted file mode 100644 index 6566257176d8..000000000000 --- a/tvix/nar-bridge/cmd/nar_bridge/serve.go +++ /dev/null @@ -1,60 +0,0 @@ -package main - -import ( - "os" - "os/signal" - - "google.golang.org/grpc" - "google.golang.org/grpc/credentials/insecure" - - "code.tvl.fyi/tvix/nar-bridge/pkg/server" - storev1pb "code.tvl.fyi/tvix/store/protos" - log "github.com/sirupsen/logrus" -) - -type ServeCmd struct { - ListenAddr string `name:"listen-addr" help:"The address this service listens on" type:"string" default:"[::]:9000"` //nolint:lll - EnableAccessLog bool `name:"access-log" help:"Enable access logging" type:"bool" default:"true" negatable:""` //nolint:lll - StoreAddr string `name:"store-addr" help:"The address to the tvix-store RPC interface this will connect to"` -} - -// `help:"Expose a tvix-store RPC interface as NAR/NARInfo"` -func (cmd *ServeCmd) Run() error { - retcode := 0 - - defer func() { os.Exit(retcode) }() - - c := make(chan os.Signal, 1) - signal.Notify(c, os.Interrupt) - - go func() { - for range c { - log.Info("Received Signal, shutting down…") - //s.Close() - os.Exit(1) - } - }() - - // connect to tvix-store - log.Debugf("Dialing to %v", cmd.StoreAddr) - conn, err := grpc.Dial(cmd.StoreAddr, grpc.WithTransportCredentials(insecure.NewCredentials())) - if err != nil { - log.Fatalf("did not connect: %v", err) - } - defer conn.Close() - - log.Printf("Starting nar-bridge at %v", cmd.ListenAddr) - s := server.New( - storev1pb.NewDirectoryServiceClient(conn), - storev1pb.NewBlobServiceClient(conn), - storev1pb.NewPathInfoServiceClient(conn), - cmd.EnableAccessLog, - 30, - ) - - err = s.ListenAndServe(cmd.ListenAddr) - if err != nil { - log.Error("Server failed: %w", err) - } - return nil -} |