14715: Fixes error handling

Also removes the path assertion from the service file and fixes copy/paste typo

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/lib/config/load.go b/lib/config/load.go
index c0b44c17eb3f421256ea8ca61b05ed965e45288b..84de9b60e991de1672ddb4c448faf860d8ee64fb 100644 (file)
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -141,7 +141,7 @@ func (ldr *Loader) MungeLegacyConfigArgs(lgr logrus.FieldLogger, args []string,
                ldr.KeepWebPath = ""
        }
        if legacyConfigArg != "-legacy-keepproxy-config" {
-               ldr.WebsocketPath = ""
+               ldr.KeepproxyPath = ""
        }
 
        return munged

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 824b748bccee3992ac979ebe38d6caf35a599c89..68500748148be5a1cdf744311481d5205a7c8b76 100644 (file)
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -108,13 +108,13 @@ func main() {
 func run(logger log.FieldLogger, cluster *arvados.Cluster) error {
        client, err := arvados.NewClientFromConfig(cluster)
        if err != nil {
-               log.Fatal(err)
+               return err
        }
        client.AuthToken = cluster.SystemRootToken
 
        arv, err := arvadosclient.New(client)
        if err != nil {
-               log.Fatalf("Error setting up arvados client %s", err.Error())
+               return fmt.Errorf("Error setting up arvados client %v", err)
        }
 
        if cluster.SystemLogs.LogLevel == "debug" {
@@ -122,7 +122,7 @@ func run(logger log.FieldLogger, cluster *arvados.Cluster) error {
        }
        kc, err := keepclient.MakeKeepClient(arv)
        if err != nil {
-               log.Fatalf("Error setting up keep client %s", err.Error())
+               return fmt.Errorf("Error setting up keep client %v", err)
        }
        keepclient.RefreshServiceDiscoveryOnSIGHUP()
 
@@ -138,13 +138,13 @@ func run(logger log.FieldLogger, cluster *arvados.Cluster) error {
        var lErr error
        listener, lErr = net.Listen("tcp", listen.Host)
        if lErr != nil {
-               log.Fatalf("listen(%s): %s", listen.Host, lErr)
+               return fmt.Errorf("listen(%s): %v", listen.Host, lErr)
        }
 
        if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
                log.Printf("Error notifying init daemon: %v", err)
        }
-       log.Println("Listening at", listener.Addr())
+       log.Println("listening at", listener.Addr())
 
        // Shut down the server gracefully (by closing the listener)
        // if SIGTERM is received.

diff --git a/services/keepproxy/keepproxy.service b/services/keepproxy/keepproxy.service
index 817aec6c4ebcc10d5900293e65d9f12d03ec08cb..1d0113e0e43a04a17fa2e7ae9657f1ed7bc9f1fa 100644 (file)
--- a/services/keepproxy/keepproxy.service
+++ b/services/keepproxy/keepproxy.service
@@ -6,7 +6,6 @@
 Description=Arvados Keep Proxy
 Documentation=https://doc.arvados.org/
 After=network.target
-AssertPathExists=/etc/arvados/config.yml
 
 # systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
 StartLimitInterval=0