Merge branch 'master' into 14716-webdav-cluster-config

[arvados.git] / lib / service / cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index cfc40778fefe43d565bb0658b626e899edfc1f09..b6737bc553d61258373d578fdac416452105ec43 100644 (file)
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -10,7 +10,6 @@ import (
        "flag"
        "fmt"
        "io"
-       "log"
        "net"
        "net/http"
        "net/url"
@@ -62,17 +61,25 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
                        log.WithError(err).Info("exiting")
                }
        }()
+
        flags := flag.NewFlagSet("", flag.ContinueOnError)
        flags.SetOutput(stderr)
-       configFile := flags.String("config", arvados.DefaultConfigFile, "Site configuration `file`")
+
+       loader := config.NewLoader(stdin, log)
+       loader.SetupFlags(flags)
+       versionFlag := flags.Bool("version", false, "Write version information to stdout and exit 0")
+
        err = flags.Parse(args)
        if err == flag.ErrHelp {
                err = nil
                return 0
        } else if err != nil {
                return 2
+       } else if *versionFlag {
+               return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
        }
-       cfg, err := config.LoadFile(*configFile, log)
+
+       cfg, err := loader.Load()
        if err != nil {
                return 1
        }
@@ -113,7 +120,8 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
        }
        srv := &httpserver.Server{
                Server: http.Server{
-                       Handler: httpserver.AddRequestIDs(httpserver.LogRequests(log, handler)),
+                       Handler: httpserver.HandlerWithContext(ctx,
+                               httpserver.AddRequestIDs(httpserver.LogRequests(handler))),
                },
                Addr: listen,
        }
@@ -142,16 +150,7 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
 
 func getListenAddr(svcs arvados.Services, prog arvados.ServiceName) (string, error) {
-       svc, ok := map[arvados.ServiceName]arvados.Service{
-               arvados.ServiceNameController:    svcs.Controller,
-               arvados.ServiceNameDispatchCloud: svcs.DispatchCloud,
-               arvados.ServiceNameHealth:        svcs.Health,
-               arvados.ServiceNameKeepbalance:   svcs.Keepbalance,
-               arvados.ServiceNameKeepproxy:     svcs.Keepproxy,
-               arvados.ServiceNameKeepstore:     svcs.Keepstore,
-               arvados.ServiceNameKeepweb:       svcs.WebDAV,
-               arvados.ServiceNameWebsocket:     svcs.Websocket,
-       }[prog]
+       svc, ok := svcs.Map()[prog]
        if !ok {
                return "", fmt.Errorf("unknown service name %q", prog)
        }
@@ -164,8 +163,6 @@ func getListenAddr(svcs arvados.Services, prog arvados.ServiceName) (string, err
                        listener.Close()
                        return url.Host, nil
                }
-               log.Print(err)
-
        }
        return "", fmt.Errorf("configuration does not enable the %s service on this host", prog)
 }