18348: Add ClusterID field to service log entries.

[arvados.git] / services / crunch-dispatch-local / crunch-dispatch-local.go

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go
index c9cbdd01fec15ca340d0e9342f8a1e24c42f1942..968b556a27e720d100abb705e3b704cb2b237299 100644 (file)
--- a/services/crunch-dispatch-local/crunch-dispatch-local.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.go
@@ -35,11 +35,11 @@ var (
 )
 
 func main() {
-       logger := logrus.StandardLogger()
+       baseLogger := logrus.StandardLogger()
        if os.Getenv("DEBUG") != "" {
-               logger.SetLevel(logrus.DebugLevel)
+               baseLogger.SetLevel(logrus.DebugLevel)
        }
-       logger.Formatter = &logrus.JSONFormatter{
+       baseLogger.Formatter = &logrus.JSONFormatter{
                TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
        }
 
@@ -70,7 +70,7 @@ func main() {
                return
        }
 
-       loader := config.NewLoader(nil, logger)
+       loader := config.NewLoader(nil, baseLogger)
        cfg, err := loader.Load()
        if err != nil {
                fmt.Fprintf(os.Stderr, "error loading config: %s\n", err)
@@ -82,6 +82,7 @@ func main() {
                os.Exit(1)
        }
 
+       logger := baseLogger.WithField("ClusterID", cluster.ClusterID)
        logger.Printf("crunch-dispatch-local %s started", version)
 
        runningCmds = make(map[string]*exec.Cmd)