X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f777c74882e6b0f52b15f62d1d6251cd180979e4..0195e1bbf4c1e5810f637212e9605d2d2dc03e7e:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 4584939f76..e853da9432 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -6,17 +6,20 @@
 package service
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"os"
 
 	"git.curoverse.com/arvados.git/lib/cmd"
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
 	"git.curoverse.com/arvados.git/sdk/go/httpserver"
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/go-systemd/daemon"
+	"github.com/sirupsen/logrus"
 )
 
 type Handler interface {
@@ -24,11 +27,12 @@ type Handler interface {
 	CheckHealth() error
 }
 
-type NewHandlerFunc func(*arvados.Cluster, *arvados.NodeProfile) Handler
+type NewHandlerFunc func(_ context.Context, _ *arvados.Cluster, _ *arvados.NodeProfile, token string) Handler
 
 type command struct {
 	newHandler NewHandlerFunc
 	svcName    arvados.ServiceName
+	ctx        context.Context // enables tests to shutdown service; no public API yet
 }
 
 // Command returns a cmd.Handler that loads site config, calls
@@ -41,15 +45,12 @@ func Command(svcName arvados.ServiceName, newHandler NewHandlerFunc) cmd.Handler
 	return &command{
 		newHandler: newHandler,
 		svcName:    svcName,
+		ctx:        context.Background(),
 	}
 }
 
 func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
-	log := logrus.New()
-	log.Formatter = &logrus.JSONFormatter{
-		TimestampFormat: rfc3339NanoFixed,
-	}
-	log.Out = stderr
+	log := ctxlog.New(stderr, "json", "info")
 
 	var err error
 	defer func() {
@@ -76,6 +77,11 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	if err != nil {
 		return 1
 	}
+	log = ctxlog.New(stderr, cluster.Logging.Format, cluster.Logging.Level).WithFields(logrus.Fields{
+		"PID": os.Getpid(),
+	})
+	ctx := ctxlog.Context(c.ctx, log)
+
 	profileName := *nodeProfile
 	if profileName == "" {
 		profileName = os.Getenv("ARVADOS_NODE_PROFILE")
@@ -89,7 +95,25 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 		err = fmt.Errorf("configuration does not enable the %s service on this host", c.svcName)
 		return 1
 	}
-	handler := c.newHandler(cluster, profile)
+
+	if cluster.SystemRootToken == "" {
+		log.Warn("SystemRootToken missing from cluster config, falling back to ARVADOS_API_TOKEN environment variable")
+		cluster.SystemRootToken = os.Getenv("ARVADOS_API_TOKEN")
+	}
+	if cluster.Services.Controller.ExternalURL.Host == "" {
+		log.Warn("Services.Controller.ExternalURL missing from cluster config, falling back to ARVADOS_API_HOST(_INSECURE) environment variables")
+		u, err := url.Parse("https://" + os.Getenv("ARVADOS_API_HOST"))
+		if err != nil {
+			err = fmt.Errorf("ARVADOS_API_HOST: %s", err)
+			return 1
+		}
+		cluster.Services.Controller.ExternalURL = arvados.URL(*u)
+		if i := os.Getenv("ARVADOS_API_HOST_INSECURE"); i != "" && i != "0" {
+			cluster.TLS.Insecure = true
+		}
+	}
+
+	handler := c.newHandler(ctx, cluster, profile, cluster.SystemRootToken)
 	if err = handler.CheckHealth(); err != nil {
 		return 1
 	}
@@ -110,6 +134,10 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
 		log.WithError(err).Errorf("error notifying init daemon")
 	}
+	go func() {
+		<-ctx.Done()
+		srv.Close()
+	}()
 	err = srv.Wait()
 	if err != nil {
 		return 1