X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2ca82cf645eb7d9dad60f98e1feca67042c38c47..8b3dd08ed1d43121bd92452c7cb0504098eb5887:/lib/boot/supervisor.go

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index d69cc9f18c..ddc17953d2 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -113,28 +113,24 @@ func (super *Supervisor) Start(ctx context.Context) {
 	super.done = make(chan struct{})
 
 	sigch := make(chan os.Signal)
-	signal.Notify(sigch, syscall.SIGINT, syscall.SIGTERM)
-	defer signal.Stop(sigch)
+	signal.Notify(sigch, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 	go func() {
-		for sig := range sigch {
-			super.logger.WithField("signal", sig).Info("caught signal")
-			if super.err == nil {
-				super.err = fmt.Errorf("caught signal %s", sig)
-			}
-			super.cancel()
-		}
-	}()
-
-	hupch := make(chan os.Signal)
-	signal.Notify(hupch, syscall.SIGHUP)
-	defer signal.Stop(hupch)
-	go func() {
-		for sig := range hupch {
-			super.logger.WithField("signal", sig).Info("caught signal")
-			if super.err == nil {
-				super.err = errNeedConfigReload
+		defer signal.Stop(sigch)
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case sig := <-sigch:
+				super.logger.WithField("signal", sig).Info("caught signal")
+				if super.err == nil {
+					if sig == syscall.SIGHUP {
+						super.err = errNeedConfigReload
+					} else {
+						super.err = fmt.Errorf("caught signal %s", sig)
+					}
+				}
+				super.cancel()
 			}
-			super.cancel()
 		}
 	}()
 
@@ -251,13 +247,9 @@ func (super *Supervisor) runCluster() error {
 	}
 
 	if super.ListenHost == "" {
-		if urlhost := super.cluster.Services.Controller.ExternalURL.Host; urlhost != "" {
-			if h, _, _ := net.SplitHostPort(urlhost); h != "" {
-				super.ListenHost = h
-			} else {
-				super.ListenHost = urlhost
-			}
-		} else {
+		u := url.URL(super.cluster.Services.Controller.ExternalURL)
+		super.ListenHost = u.Hostname()
+		if super.ListenHost == "" {
 			super.ListenHost = "0.0.0.0"
 		}
 	}
@@ -365,7 +357,7 @@ func (super *Supervisor) runCluster() error {
 		runNginx{},
 		runServiceCommand{name: "controller", svc: super.cluster.Services.Controller, depends: []supervisedTask{seedDatabase{}}},
 		runServiceCommand{name: "git-httpd", svc: super.cluster.Services.GitHTTP},
-		runGoProgram{src: "services/health", svc: super.cluster.Services.Health},
+		runServiceCommand{name: "health", svc: super.cluster.Services.Health},
 		runServiceCommand{name: "keepproxy", svc: super.cluster.Services.Keepproxy, depends: []supervisedTask{runPassenger{src: "services/api"}}},
 		runServiceCommand{name: "keepstore", svc: super.cluster.Services.Keepstore},
 		runServiceCommand{name: "keep-web", svc: super.cluster.Services.WebDAV},
@@ -471,6 +463,7 @@ func (super *Supervisor) WaitReady() bool {
 			super.logger.Infof("waiting for %s to be ready", id)
 			if !super2.WaitReady() {
 				super.logger.Infof("%s startup failed", id)
+				super.Stop()
 				return false
 			}
 			super.logger.Infof("%s is ready", id)
@@ -484,6 +477,7 @@ func (super *Supervisor) WaitReady() bool {
 		select {
 		case <-ticker.C:
 		case <-super.ctx.Done():
+			super.Stop()
 			return false
 		}
 		if super.healthChecker == nil {
@@ -848,7 +842,8 @@ func (super *Supervisor) autofillConfig() error {
 			}
 		}
 		if super.NoWorkbench1 && svc == &super.cluster.Services.Workbench1 ||
-			super.NoWorkbench2 && svc == &super.cluster.Services.Workbench2 {
+			super.NoWorkbench2 && svc == &super.cluster.Services.Workbench2 ||
+			!super.cluster.Containers.CloudVMs.Enable && svc == &super.cluster.Services.DispatchCloud {
 			// When workbench1 is disabled, it gets an
 			// ExternalURL (so we have a valid listening
 			// port to write in our Nginx config) but no