X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5d82dc390a8e158b71c3c96cb1d0f301f3f12dbb..e23f03950b82e72de23c4c44112785a9e92ea235:/services/keep-web/main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 289f413f5d..208b23b93b 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -5,14 +5,19 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
+	"mime"
 	"os"
 
-	"git.curoverse.com/arvados.git/lib/config"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	sdkConfig "git.curoverse.com/arvados.git/sdk/go/config"
+	"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"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -27,8 +32,7 @@ type Config struct {
 	cluster *arvados.Cluster
 }
 
-// DefaultConfig returns the default configuration.
-func DefaultConfig(arvCfg *arvados.Config) *Config {
+func newConfig(logger logrus.FieldLogger, arvCfg *arvados.Config) *Config {
 	cfg := Config{}
 	var cls *arvados.Cluster
 	var err error
@@ -37,6 +41,8 @@ func DefaultConfig(arvCfg *arvados.Config) *Config {
 	}
 	cfg.cluster = cls
 	cfg.Cache.config = &cfg.cluster.Collections.WebDAVCache
+	cfg.Cache.cluster = cls
+	cfg.Cache.logger = logger
 	return &cfg
 }
 
@@ -55,12 +61,8 @@ func init() {
 	})
 }
 
-func main() {
-	prog := os.Args[0]
-	args := os.Args[1:]
-	logger := log.New()
-
-	flags := flag.NewFlagSet(prog, 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)
@@ -70,37 +72,59 @@ func main() {
 	getVersion := flags.Bool("version", false,
 		"print version information and exit.")
 
-	args = loader.MungeLegacyConfigArgs(logger, args, "-legacy-keepweb-config")
-	flags.Parse(args)
-
-	// Print version information if requested
-	if *getVersion {
-		fmt.Printf("keep-web %s\n", version)
-		return
+	prog := args[0]
+	args = loader.MungeLegacyConfigArgs(logger, args[1:], "-legacy-keepweb-config")
+	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 := DefaultConfig(arvCfg)
+	cfg := newConfig(logger, arvCfg)
 
 	if *dumpConfig {
-		log.Fatal(sdkConfig.DumpAndExit(cfg.cluster))
+		out, err := yaml.Marshal(cfg)
+		if err != nil {
+			return nil, err
+		}
+		_, err = os.Stdout.Write(out)
+		return nil, err
 	}
+	return cfg, nil
+}
 
-	log.Printf("keep-web %s started", version)
+func main() {
+	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
+	}
+	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)
+	}
 
 	os.Setenv("ARVADOS_API_HOST", cfg.cluster.Services.Controller.ExternalURL.Host)
 	srv := &server{Config: cfg}
-	if err := srv.Start(); 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)
 	}
 }