X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/570a9f8e5504d518b118952098b95f11761dda18..cc524d1012ec16c90879e81cfb3b6f693f7d93f2:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 48912b8898..901fda2289 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -29,6 +29,7 @@ import (
 type Handler interface {
 	http.Handler
 	CheckHealth() error
+	Done() <-chan struct{}
 }
 
 type NewHandlerFunc func(_ context.Context, _ *arvados.Cluster, token string, registry *prometheus.Registry) Handler
@@ -59,7 +60,7 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	var err error
 	defer func() {
 		if err != nil {
-			log.WithError(err).Info("exiting")
+			log.WithError(err).Error("exiting")
 		}
 	}()
 
@@ -148,9 +149,15 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 		logger.WithError(err).Errorf("error notifying init daemon")
 	}
 	go func() {
+		// Shut down server if caller cancels context
 		<-ctx.Done()
 		srv.Close()
 	}()
+	go func() {
+		// Shut down server if handler dies
+		<-handler.Done()
+		srv.Close()
+	}()
 	err = srv.Wait()
 	if err != nil {
 		return 1
@@ -170,6 +177,9 @@ func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.F
 	} else if url, err := url.Parse(want); err != nil {
 		return arvados.URL{}, fmt.Errorf("$ARVADOS_SERVICE_INTERNAL_URL (%q): %s", want, err)
 	} else {
+		if url.Path == "" {
+			url.Path = "/"
+		}
 		return arvados.URL(*url), nil
 	}