18947: Use git-ls-files instead of git-grep to find go dirs.

[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 3edfcf4ca68454418e62dd29739a16c07f68c242..b926ac273520d4d92788bbcd11b5bcd68bf304be 100644 (file)
--- a/services/arv-git-httpd/main.go
+++ b/services/arv-git-httpd/main.go
@@ -9,7 +9,8 @@ import (
        "fmt"
        "os"
 
-       "git.curoverse.com/arvados.git/lib/config"
+       "git.arvados.org/arvados.git/lib/cmd"
+       "git.arvados.org/arvados.git/lib/config"
        "github.com/coreos/go-systemd/daemon"
        "github.com/ghodss/yaml"
        log "github.com/sirupsen/logrus"
@@ -23,7 +24,7 @@ func main() {
                TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
        })
 
-       flags := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
+       flags := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
        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")
-       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
        }