X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/18d6239d25924545ba91825011d467861cd5513c..35a23c29e610809d19635aba3cc1956128cb75d2:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 3447bfb16e..d99af0eea1 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -6,18 +6,27 @@
 package service
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io"
 	"net/http"
+	"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 NewHandlerFunc func(*arvados.Cluster, *arvados.SystemNode) http.Handler
+type Handler interface {
+	http.Handler
+	CheckHealth() error
+}
+
+type NewHandlerFunc func(context.Context, *arvados.Cluster, *arvados.NodeProfile) Handler
 
 type command struct {
 	newHandler NewHandlerFunc
@@ -38,11 +47,7 @@ func Command(svcName arvados.ServiceName, newHandler NewHandlerFunc) cmd.Handler
 }
 
 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() {
@@ -53,7 +58,7 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	flags := flag.NewFlagSet("", flag.ContinueOnError)
 	flags.SetOutput(stderr)
 	configFile := flags.String("config", arvados.DefaultConfigFile, "Site configuration `file`")
-	hostName := flags.String("host", "", "Host profile `name` to use in SystemNodes config (if blank, use hostname reported by OS)")
+	nodeProfile := flags.String("node-profile", "", "`Name` of NodeProfiles config entry to use (if blank, use $ARVADOS_NODE_PROFILE or hostname reported by OS)")
 	err = flags.Parse(args)
 	if err == flag.ErrHelp {
 		err = nil
@@ -69,18 +74,30 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	if err != nil {
 		return 1
 	}
-	node, err := cluster.GetSystemNode(*hostName)
+	log = ctxlog.New(stderr, cluster.Logging.Format, cluster.Logging.Level).WithFields(logrus.Fields{
+		"PID": os.Getpid(),
+	})
+	ctx := ctxlog.Context(context.Background(), log)
+	profileName := *nodeProfile
+	if profileName == "" {
+		profileName = os.Getenv("ARVADOS_NODE_PROFILE")
+	}
+	profile, err := cluster.GetNodeProfile(profileName)
 	if err != nil {
 		return 1
 	}
-	listen := node.ServicePorts()[c.svcName]
+	listen := profile.ServicePorts()[c.svcName]
 	if listen == "" {
 		err = fmt.Errorf("configuration does not enable the %s service on this host", c.svcName)
 		return 1
 	}
+	handler := c.newHandler(ctx, cluster, profile)
+	if err = handler.CheckHealth(); err != nil {
+		return 1
+	}
 	srv := &httpserver.Server{
 		Server: http.Server{
-			Handler: httpserver.AddRequestIDs(httpserver.LogRequests(log, c.newHandler(cluster, node))),
+			Handler: httpserver.AddRequestIDs(httpserver.LogRequests(log, handler)),
 		},
 		Addr: listen,
 	}
@@ -92,6 +109,9 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 		"Listen":  srv.Addr,
 		"Service": c.svcName,
 	}).Info("listening")
+	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
+		log.WithError(err).Errorf("error notifying init daemon")
+	}
 	err = srv.Wait()
 	if err != nil {
 		return 1