projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18696-rnaseq-training' refs #18696
[arvados.git]
/
services
/
arv-git-httpd
/
main.go
diff --git
a/services/arv-git-httpd/main.go
b/services/arv-git-httpd/main.go
index 4e55964619acb6d1f29fe9b6ceb6ac5fbdf386cf..b926ac273520d4d92788bbcd11b5bcd68bf304be 100644
(file)
--- a/
services/arv-git-httpd/main.go
+++ b/
services/arv-git-httpd/main.go
@@
-9,6
+9,7
@@
import (
"fmt"
"os"
"fmt"
"os"
+ "git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/config"
"github.com/coreos/go-systemd/daemon"
"github.com/ghodss/yaml"
"git.arvados.org/arvados.git/lib/config"
"github.com/coreos/go-systemd/daemon"
"github.com/ghodss/yaml"
@@
-23,7
+24,7
@@
func main() {
TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
})
TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
})
- flags := flag.NewFlagSet(os.Args[0], flag.
Exit
OnError)
+ flags := flag.NewFlagSet(os.Args[0], flag.
Continue
OnError)
loader := config.NewLoader(os.Stdin, logger)
loader.SetupFlags(flags)
loader := config.NewLoader(os.Stdin, logger)
loader.SetupFlags(flags)
@@
-31,9
+32,9
@@
func main() {
getVersion := flags.Bool("version", false, "print version information and exit.")
args := loader.MungeLegacyConfigArgs(logger, os.Args[1:], "-legacy-git-httpd-config")
getVersion := flags.Bool("version", false, "print version information and exit.")
args := loader.MungeLegacyConfigArgs(logger, os.Args[1:], "-legacy-git-httpd-config")
- flags.Parse(args)
-
- if *getVersion {
+ if ok, code := cmd.ParseFlags(flags, os.Args[0], args, "", os.Stderr); !ok {
+ os.Exit(code)
+
} else
if *getVersion {
fmt.Printf("arv-git-httpd %s\n", version)
return
}
fmt.Printf("arv-git-httpd %s\n", version)
return
}