X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/71229e23918b698caa7c6c8b62b368d4aef2ab85..1b290e512496287e389424f3950f660f83c1c59b:/services/keep-balance/main.go

diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index 926a0f2da3..04d3e9992b 100644
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -11,7 +11,6 @@ import (
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 	"git.curoverse.com/arvados.git/sdk/go/config"
-	"github.com/ghodss/yaml"
 )
 
 const defaultConfigPath = "/etc/arvados/keep-balance/keep-balance.yml"
@@ -65,7 +64,7 @@ type RunOptions struct {
 var debugf = func(string, ...interface{}) {}
 
 func main() {
-	var config Config
+	var cfg Config
 	var runOptions RunOptions
 
 	configPath := flag.String("config", defaultConfigPath,
@@ -85,23 +84,18 @@ func main() {
 	flag.Usage = usage
 	flag.Parse()
 
-	mustReadConfig(&config, *configPath)
+	mustReadConfig(&cfg, *configPath)
 	if *serviceListPath != "" {
-		mustReadConfig(&config.KeepServiceList, *serviceListPath)
+		mustReadConfig(&cfg.KeepServiceList, *serviceListPath)
 	}
 
 	if *dumpConfig {
-		y, err := yaml.Marshal(config)
-		if err != nil {
-			log.Fatal(err)
-		}
-		os.Stdout.Write(y)
-		os.Exit(0)
+		log.Fatal(config.DumpAndExit(cfg))
 	}
 
 	if *debugFlag {
 		debugf = log.Printf
-		if j, err := json.Marshal(config); err != nil {
+		if j, err := json.Marshal(cfg); err != nil {
 			log.Fatal(err)
 		} else {
 			log.Printf("config is %s", j)
@@ -110,13 +104,13 @@ func main() {
 	if *dumpFlag {
 		runOptions.Dumper = log.New(os.Stdout, "", log.LstdFlags)
 	}
-	err := CheckConfig(config, runOptions)
+	err := CheckConfig(cfg, runOptions)
 	if err != nil {
 		// (don't run)
 	} else if runOptions.Once {
-		_, err = (&Balancer{}).Run(config, runOptions)
+		_, err = (&Balancer{}).Run(cfg, runOptions)
 	} else {
-		err = RunForever(config, runOptions, nil)
+		err = RunForever(cfg, runOptions, nil)
 	}
 	if err != nil {
 		log.Fatal(err)