X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b4be060bb0ee42281fc3a044c60d2b55c74475f8..168deb4dd5428964f857fa6de8d856aec3953532:/services/keep-balance/main.go diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go index cf844ab050..8b4ee84c71 100644 --- a/services/keep-balance/main.go +++ b/services/keep-balance/main.go @@ -11,10 +11,11 @@ import ( "io" "os" - "git.curoverse.com/arvados.git/lib/config" - "git.curoverse.com/arvados.git/lib/service" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/lib/config" + "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" ) @@ -50,10 +51,17 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W 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 + dropFlag := map[string]bool{ + "once": true, + "commit-pulls": true, + "commit-trash": true, + "dump": true, + } flags.Visit(func(f *flag.Flag) { - if f.Name == "version" { + if !dropFlag[f.Name] { 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, } + srv.Handler = &health.Handler{ + Token: cluster.ManagementToken, + Prefix: "/_health/", + Routes: health.Routes{"ping": srv.CheckHealth}, + } go srv.run() return srv