projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12475: Add TestManyFailedPuts with a short timeout.
[arvados.git]
/
services
/
keep-balance
/
main.go
diff --git
a/services/keep-balance/main.go
b/services/keep-balance/main.go
index 926a0f2da341f6fd13780dbc69bc5e088c95e032..8a938ccf5308393311a121835c1eaef631f194ca 100644
(file)
--- a/
services/keep-balance/main.go
+++ b/
services/keep-balance/main.go
@@
-1,3
+1,7
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package main
import (
package main
import (
@@
-11,7
+15,6
@@
import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
"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"
)
const defaultConfigPath = "/etc/arvados/keep-balance/keep-balance.yml"
@@
-65,7
+68,7
@@
type RunOptions struct {
var debugf = func(string, ...interface{}) {}
func main() {
var debugf = func(string, ...interface{}) {}
func main() {
- var c
onfi
g Config
+ var c
f
g Config
var runOptions RunOptions
configPath := flag.String("config", defaultConfigPath,
var runOptions RunOptions
configPath := flag.String("config", defaultConfigPath,
@@
-85,23
+88,18
@@
func main() {
flag.Usage = usage
flag.Parse()
flag.Usage = usage
flag.Parse()
- mustReadConfig(&c
onfi
g, *configPath)
+ mustReadConfig(&c
f
g, *configPath)
if *serviceListPath != "" {
if *serviceListPath != "" {
- mustReadConfig(&c
onfi
g.KeepServiceList, *serviceListPath)
+ mustReadConfig(&c
f
g.KeepServiceList, *serviceListPath)
}
if *dumpConfig {
}
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 *debugFlag {
debugf = log.Printf
- if j, err := json.Marshal(c
onfi
g); err != nil {
+ if j, err := json.Marshal(c
f
g); err != nil {
log.Fatal(err)
} else {
log.Printf("config is %s", j)
log.Fatal(err)
} else {
log.Printf("config is %s", j)
@@
-110,13
+108,13
@@
func main() {
if *dumpFlag {
runOptions.Dumper = log.New(os.Stdout, "", log.LstdFlags)
}
if *dumpFlag {
runOptions.Dumper = log.New(os.Stdout, "", log.LstdFlags)
}
- err := CheckConfig(c
onfi
g, runOptions)
+ err := CheckConfig(c
f
g, runOptions)
if err != nil {
// (don't run)
} else if runOptions.Once {
if err != nil {
// (don't run)
} else if runOptions.Once {
- _, err = (&Balancer{}).Run(c
onfi
g, runOptions)
+ _, err = (&Balancer{}).Run(c
f
g, runOptions)
} else {
} else {
- err = RunForever(c
onfi
g, runOptions, nil)
+ err = RunForever(c
f
g, runOptions, nil)
}
if err != nil {
log.Fatal(err)
}
if err != nil {
log.Fatal(err)