X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0662b235357dd40b5d27efd06b60044ddcec06f6..4a264f6333b34ecc364d2a6f9e18c7f3e35a076d:/services/keep-web/main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 135f01b394..a9ac834a20 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -1,11 +1,48 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
 	"flag"
-	"log"
+	"fmt"
+	"mime"
 	"os"
+
+	"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"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
+)
+
+var (
+	version = "dev"
 )
 
+// Config specifies server configuration.
+type Config struct {
+	Client  arvados.Client
+	Cache   cache
+	cluster *arvados.Cluster
+}
+
+func newConfig(logger logrus.FieldLogger, 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
+	cfg.Cache.cluster = cls
+	cfg.Cache.logger = logger
+	return &cfg
+}
+
 func init() {
 	// MakeArvadosClient returns an error if this env var isn't
 	// available as a default token (even if we explicitly set a
@@ -15,17 +52,74 @@ 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 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 := flags.Bool("version", false,
+		"print version information and exit.")
+
+	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
+	}
+
+	arvCfg, err := loader.Load()
+	if err != nil {
+		log.Fatal(err)
+	}
+	cfg := newConfig(logger, arvCfg)
+
+	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
+	}
+	return cfg
 }
 
 func main() {
-	flag.Parse()
-	if os.Getenv("ARVADOS_API_HOST") == "" {
-		log.Fatal("ARVADOS_API_HOST environment variable must be set.")
+	logger := log.New()
+
+	cfg := configure(logger, os.Args)
+	if cfg == nil {
+		return
 	}
-	srv := &server{}
-	if err := srv.Start(); err != nil {
+
+	log.Printf("keep-web %s started", version)
+
+	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(logrus.StandardLogger()); err != nil {
 		log.Fatal(err)
 	}
+	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
+		log.Printf("Error notifying init daemon: %v", err)
+	}
 	log.Println("Listening at", srv.Addr)
 	if err := srv.Wait(); err != nil {
 		log.Fatal(err)