17840: Deduplicate flag-parsing code.

[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 af63b32ab3d3eeb3fd76d1b70669b474508cf4d9..b926ac273520d4d92788bbcd11b5bcd68bf304be 100644 (file)
--- a/services/arv-git-httpd/main.go
+++ b/services/arv-git-httpd/main.go
@@ -9,6 +9,7 @@ import (
        "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"
@@ -31,18 +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")
-       err := flags.Parse(args)
-       if err == flag.ErrHelp {
-               return
-       } else if err != nil {
-               logger.Error(err)
-               os.Exit(2)
-       } else if flags.NArg() != 0 {
-               logger.Errorf("unrecognized command line arguments: %v", flags.Args())
-               os.Exit(2)
-       }
-
-       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
        }