X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0c888bcc93b559339c8abbce784bdcc44746bca2..2f66d4cc05e9442a9bb69969744d0750a02a1ed4:/services/keep-web/main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 724af27c7e..e4028842f0 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -7,53 +7,37 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
+	"mime"
 	"os"
-	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/config"
+	"git.arvados.org/arvados.git/lib/config"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"github.com/coreos/go-systemd/daemon"
+	"github.com/ghodss/yaml"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
-	defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
-	version           = "dev"
+	version = "dev"
 )
 
 // Config specifies server configuration.
 type Config struct {
-	Client arvados.Client
-
-	Listen string
-
-	AnonymousTokens    []string
-	AttachmentOnlyHost string
-	TrustAllContent    bool
-
-	Cache cache
-
-	// Hack to support old command line flag, which is a bool
-	// meaning "get actual token from environment".
-	deprecatedAllowAnonymous bool
-
-	//Authorization token to be included in all health check requests.
-	ManagementToken string
+	Client  arvados.Client
+	Cache   cache
+	cluster *arvados.Cluster
 }
 
-// DefaultConfig returns the default configuration.
-func DefaultConfig() *Config {
-	return &Config{
-		Listen: ":80",
-		Cache: cache{
-			TTL:                  arvados.Duration(5 * time.Minute),
-			UUIDTTL:              arvados.Duration(5 * time.Second),
-			MaxCollectionEntries: 1000,
-			MaxCollectionBytes:   100000000,
-			MaxPermissionEntries: 1000,
-			MaxUUIDEntries:       1000,
-		},
+func newConfig(arvCfg *arvados.Config) *Config {
+	cfg := Config{}
+	var cls *arvados.Cluster
+	var err error
+	if cls, err = arvCfg.GetCluster(""); err != nil {
+		log.Fatal(err)
 	}
+	cfg.cluster = cls
+	cfg.Cache.config = &cfg.cluster.Collections.WebDAVCache
+	return &cfg
 }
 
 func init() {
@@ -65,59 +49,67 @@ func init() {
 	if os.Getenv("ARVADOS_API_TOKEN") == "" {
 		os.Setenv("ARVADOS_API_TOKEN", "xxx")
 	}
+
+	log.SetFormatter(&log.JSONFormatter{
+		TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
+	})
 }
 
-func main() {
-	cfg := DefaultConfig()
-
-	var configPath string
-	deprecated := " (DEPRECATED -- use config file instead)"
-	flag.StringVar(&configPath, "config", defaultConfigPath,
-		"`path` to JSON or YAML configuration file")
-	flag.StringVar(&cfg.Listen, "listen", "",
-		"address:port or :port to listen on"+deprecated)
-	flag.BoolVar(&cfg.deprecatedAllowAnonymous, "allow-anonymous", false,
-		"Load an anonymous token from the ARVADOS_API_TOKEN environment variable"+deprecated)
-	flag.StringVar(&cfg.AttachmentOnlyHost, "attachment-only-host", "",
-		"Only serve attachments at the given `host:port`"+deprecated)
-	flag.BoolVar(&cfg.TrustAllContent, "trust-all-content", false,
-		"Serve non-public content from a single origin. Dangerous: read docs before using!"+deprecated)
-	flag.StringVar(&cfg.ManagementToken, "management-token", "",
-		"Authorization token to be included in all health check requests.")
-
-	dumpConfig := flag.Bool("dump-config", false,
+func configure(logger log.FieldLogger, args []string) *Config {
+	flags := flag.NewFlagSet(args[0], flag.ExitOnError)
+
+	loader := config.NewLoader(os.Stdin, logger)
+	loader.SetupFlags(flags)
+
+	dumpConfig := flags.Bool("dump-config", false,
 		"write current configuration to stdout and exit")
-	getVersion := flag.Bool("version", false,
+	getVersion := flags.Bool("version", false,
 		"print version information and exit.")
-	flag.Usage = usage
-	flag.Parse()
+
+	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
+		return nil
+	}
+
+	arvCfg, err := loader.Load()
+	if err != nil {
+		log.Fatal(err)
 	}
+	cfg := newConfig(arvCfg)
 
-	if err := config.LoadFile(cfg, configPath); err != nil {
-		if h := os.Getenv("ARVADOS_API_HOST"); h != "" && configPath == defaultConfigPath {
-			log.Printf("DEPRECATED: Using ARVADOS_API_HOST environment variable. Use config file instead.")
-			cfg.Client.APIHost = h
-		} else {
+	if *dumpConfig {
+		out, err := yaml.Marshal(cfg)
+		if err != nil {
 			log.Fatal(err)
 		}
+		_, err = os.Stdout.Write(out)
+		if err != nil {
+			log.Fatal(err)
+		}
+		return nil
 	}
-	if cfg.deprecatedAllowAnonymous {
-		log.Printf("DEPRECATED: Using -allow-anonymous command line flag with ARVADOS_API_TOKEN environment variable. Use config file instead.")
-		cfg.AnonymousTokens = []string{os.Getenv("ARVADOS_API_TOKEN")}
-	}
+	return cfg
+}
 
-	if *dumpConfig {
-		log.Fatal(config.DumpAndExit(cfg))
+func main() {
+	logger := log.New()
+
+	cfg := configure(logger, os.Args)
+	if cfg == nil {
+		return
 	}
 
 	log.Printf("keep-web %s started", version)
 
-	os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
+	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)