X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c8bf4dc1eef2a73b4b01501eabdc922e2a27a276..89cab1faedd4c4209ac642ffd442b0085d9da593:/services/keep-web/main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index a9ac834a20..208b23b93b 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -5,13 +5,16 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"mime"
 	"os"
 
+	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"github.com/coreos/go-systemd/daemon"
 	"github.com/ghodss/yaml"
 	"github.com/sirupsen/logrus"
@@ -58,8 +61,8 @@ func init() {
 	})
 }
 
-func configure(logger log.FieldLogger, args []string) *Config {
-	flags := flag.NewFlagSet(args[0], flag.ExitOnError)
+func configure(logger log.FieldLogger, args []string) (*Config, error) {
+	flags := flag.NewFlagSet(args[0], flag.ContinueOnError)
 
 	loader := config.NewLoader(os.Stdin, logger)
 	loader.SetupFlags(flags)
@@ -69,44 +72,44 @@ func configure(logger log.FieldLogger, args []string) *Config {
 	getVersion := flags.Bool("version", false,
 		"print version information and exit.")
 
+	prog := args[0]
 	args = loader.MungeLegacyConfigArgs(logger, args[1:], "-legacy-keepweb-config")
-	flags.Parse(args)
-
-	// Print version information if requested
-	if *getVersion {
-		fmt.Printf("keep-web %s\n", version)
-		return nil
+	if ok, code := cmd.ParseFlags(flags, prog, args, "", os.Stderr); !ok {
+		os.Exit(code)
+	} else if *getVersion {
+		fmt.Printf("%s %s\n", args[0], version)
+		return nil, nil
 	}
 
 	arvCfg, err := loader.Load()
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
 	cfg := newConfig(logger, arvCfg)
 
 	if *dumpConfig {
 		out, err := yaml.Marshal(cfg)
 		if err != nil {
-			log.Fatal(err)
+			return nil, err
 		}
 		_, err = os.Stdout.Write(out)
-		if err != nil {
-			log.Fatal(err)
-		}
-		return nil
+		return nil, err
 	}
-	return cfg
+	return cfg, nil
 }
 
 func main() {
-	logger := log.New()
-
-	cfg := configure(logger, os.Args)
-	if cfg == nil {
+	initLogger := log.StandardLogger()
+	logger := initLogger.WithField("PID", os.Getpid())
+	cfg, err := configure(logger, os.Args)
+	if err != nil {
+		log.Fatal(err)
+	} else if cfg == nil {
 		return
 	}
-
-	log.Printf("keep-web %s started", version)
+	logger = logger.WithField("ClusterID", cfg.cluster.ClusterID)
+	logger.Printf("keep-web %s started", version)
+	ctx := ctxlog.Context(context.Background(), logger)
 
 	if ext := ".txt"; mime.TypeByExtension(ext) == "" {
 		log.Warnf("cannot look up MIME type for %q -- this probably means /etc/mime.types is missing -- clients will see incorrect content types", ext)
@@ -114,14 +117,14 @@ func main() {
 
 	os.Setenv("ARVADOS_API_HOST", cfg.cluster.Services.Controller.ExternalURL.Host)
 	srv := &server{Config: cfg}
-	if err := srv.Start(logrus.StandardLogger()); err != nil {
-		log.Fatal(err)
+	if err := srv.Start(ctx, initLogger); err != nil {
+		logger.Fatal(err)
 	}
 	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
-		log.Printf("Error notifying init daemon: %v", err)
+		logger.Printf("Error notifying init daemon: %v", err)
 	}
-	log.Println("Listening at", srv.Addr)
+	logger.Println("Listening at", srv.Addr)
 	if err := srv.Wait(); err != nil {
-		log.Fatal(err)
+		logger.Fatal(err)
 	}
 }