X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7af0535d3b0d7960152b06b7211c26bfd7b208cb..7519cf2beb1d81ce578dd2ef0624d77b9588ce70:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 40db4f9c7c..dbafc89fe4 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -72,12 +72,8 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	loader.SetupFlags(flags)
 	versionFlag := flags.Bool("version", false, "Write version information to stdout and exit 0")
 	pprofAddr := flags.String("pprof", "", "Serve Go profile data at `[addr]:port`")
-	err = flags.Parse(args)
-	if err == flag.ErrHelp {
-		err = nil
-		return 0
-	} else if err != nil {
-		return 2
+	if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
+		return code
 	} else if *versionFlag {
 		return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
 	}
@@ -109,7 +105,8 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	// logger with a new one according to the logging config.
 	log = ctxlog.New(stderr, cluster.SystemLogs.Format, cluster.SystemLogs.LogLevel)
 	logger := log.WithFields(logrus.Fields{
-		"PID": os.Getpid(),
+		"PID":       os.Getpid(),
+		"ClusterID": cluster.ClusterID,
 	})
 	ctx := ctxlog.Context(c.ctx, logger)
 
@@ -126,13 +123,14 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	}
 
 	instrumented := httpserver.Instrument(reg, log,
-		httpserver.HandlerWithContext(ctx,
+		httpserver.HandlerWithDeadline(cluster.API.RequestTimeout.Duration(),
 			httpserver.AddRequestIDs(
 				httpserver.LogRequests(
 					httpserver.NewRequestLimiter(cluster.API.MaxConcurrentRequests, handler, reg)))))
 	srv := &httpserver.Server{
 		Server: http.Server{
-			Handler: instrumented.ServeAPI(cluster.ManagementToken, instrumented),
+			Handler:     instrumented.ServeAPI(cluster.ManagementToken, instrumented),
+			BaseContext: func(net.Listener) context.Context { return ctx },
 		},
 		Addr: listenURL.Host,
 	}