projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update `arvados-server install` to use go 1.16.3
[arvados.git]
/
services
/
keep-balance
/
main.go
diff --git
a/services/keep-balance/main.go
b/services/keep-balance/main.go
index 6e89df9a5552cc34bac4d13e3bae4356d6acf48a..8b4ee84c716e4596987b1371b38035610f9ffa2f 100644
(file)
--- a/
services/keep-balance/main.go
+++ b/
services/keep-balance/main.go
@@
-15,6
+15,7
@@
import (
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
+ "git.arvados.org/arvados.git/sdk/go/health"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
)
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
)
@@
-50,10
+51,17
@@
func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
options.Dumper = dumper
}
options.Dumper = dumper
}
- // Only pass along the version flag, which gets handled in RunCommand
+ // Drop our custom args that would be rejected by the generic
+ // service.Command
args = nil
args = nil
+ dropFlag := map[string]bool{
+ "once": true,
+ "commit-pulls": true,
+ "commit-trash": true,
+ "dump": true,
+ }
flags.Visit(func(f *flag.Flag) {
flags.Visit(func(f *flag.Flag) {
- if
f.Name == "version"
{
+ if
!dropFlag[f.Name]
{
args = append(args, "-"+f.Name, f.Value.String())
}
})
args = append(args, "-"+f.Name, f.Value.String())
}
})
@@
-82,6
+90,11
@@
func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
Logger: options.Logger,
Dumper: options.Dumper,
}
Logger: options.Logger,
Dumper: options.Dumper,
}
+ srv.Handler = &health.Handler{
+ Token: cluster.ManagementToken,
+ Prefix: "/_health/",
+ Routes: health.Routes{"ping": srv.CheckHealth},
+ }
go srv.run()
return srv
go srv.run()
return srv