X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d7e76aa491a1878196d3f57f2e61e09d193f5070..927524f1be454de021180b74999d682780b8cb6b:/services/keep-balance/main.go

diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index e1573e7f73..8a95d389c8 100644
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -13,6 +13,7 @@ import (
 	_ "net/http/pprof"
 	"os"
 
+	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/lib/service"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
@@ -32,7 +33,7 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
 	logger := ctxlog.FromContext(context.Background())
 
 	var options RunOptions
-	flags := flag.NewFlagSet(prog, flag.ExitOnError)
+	flags := flag.NewFlagSet(prog, flag.ContinueOnError)
 	flags.BoolVar(&options.Once, "once", false,
 		"balance once and then exit")
 	flags.BoolVar(&options.CommitPulls, "commit-pulls", false,
@@ -41,9 +42,12 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
 		"send trash requests (delete unreferenced old blocks, and excess replicas of overreplicated blocks)")
 	flags.BoolVar(&options.CommitConfirmedFields, "commit-confirmed-fields", true,
 		"update collection fields (replicas_confirmed, storage_classes_confirmed, etc.)")
-	flags.Bool("version", false, "Write version information to stdout and exit 0")
 	dumpFlag := flags.Bool("dump", false, "dump details for each block to stdout")
 	pprofAddr := flags.String("pprof", "", "serve Go profile data at `[addr]:port`")
+	// "show version" is implemented by service.Command, so we
+	// don't need the var here -- we just need the -version flag
+	// to pass flags.Parse().
+	flags.Bool("version", false, "Write version information to stdout and exit 0")
 
 	if *pprofAddr != "" {
 		go func() {
@@ -55,7 +59,9 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
 	loader.SetupFlags(flags)
 
 	munged := loader.MungeLegacyConfigArgs(logger, args, "-legacy-keepbalance-config")
-	flags.Parse(munged)
+	if ok, code := cmd.ParseFlags(flags, prog, munged, "", stderr); !ok {
+		return code
+	}
 
 	if *dumpFlag {
 		dumper := logrus.New()
@@ -76,7 +82,7 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
 	}
 	flags.Visit(func(f *flag.Flag) {
 		if !dropFlag[f.Name] {
-			args = append(args, "-"+f.Name, f.Value.String())
+			args = append(args, "-"+f.Name+"="+f.Value.String())
 		}
 	})