X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2b8fc576e242c0b8658eef9f1130143e009efc4d..fd9342c42faaf2c6aa2a6800fe91172bf24e2916:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index e67c24f65f..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)