projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15781-multi-value-property-search'
[arvados.git]
/
services
/
keep-balance
/
main.go
diff --git
a/services/keep-balance/main.go
b/services/keep-balance/main.go
index 6e89df9a5552cc34bac4d13e3bae4356d6acf48a..65bd8d4cf098a17610953810ab8147f678616aee 100644
(file)
--- a/
services/keep-balance/main.go
+++ b/
services/keep-balance/main.go
@@
-9,6
+9,7
@@
import (
"flag"
"fmt"
"io"
"flag"
"fmt"
"io"
+ "net/http"
"os"
"git.arvados.org/arvados.git/lib/config"
"os"
"git.arvados.org/arvados.git/lib/config"
@@
-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())
}
})
@@
-75,6
+83,7
@@
func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
}
srv := &Server{
}
srv := &Server{
+ Handler: http.NotFoundHandler(),
Cluster: cluster,
ArvClient: ac,
RunOptions: options,
Cluster: cluster,
ArvClient: ac,
RunOptions: options,