X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/87fcb4c388573967b0dedf6a23557fcf9888d998..c74724887ec59ac55ccbaff99cae2722100eda37:/services/keep-web/main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 2d563bd76f..018b5a2e81 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -1,17 +1,24 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
 	"flag"
-	"log"
+	"fmt"
 	"os"
+	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 	"git.curoverse.com/arvados.git/sdk/go/config"
 	"github.com/coreos/go-systemd/daemon"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
-	defaultConfigPath = "/etc/arvados/keep-web/config.json"
+	defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
+	version           = "dev"
 )
 
 // Config specifies server configuration.
@@ -24,15 +31,28 @@ type Config struct {
 	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
 }
 
 // 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,
+		},
 	}
 }
 
@@ -45,6 +65,10 @@ 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() {
@@ -53,7 +77,7 @@ func main() {
 	var configPath string
 	deprecated := " (DEPRECATED -- use config file instead)"
 	flag.StringVar(&configPath, "config", defaultConfigPath,
-		"`path` to json configuration file")
+		"`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,
@@ -62,9 +86,22 @@ func main() {
 		"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,
+		"write current configuration to stdout and exit")
+	getVersion := flag.Bool("version", false,
+		"print version information and exit.")
 	flag.Usage = usage
 	flag.Parse()
 
+	// Print version information if requested
+	if *getVersion {
+		fmt.Printf("keep-web %s\n", version)
+		return
+	}
+
 	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.")
@@ -78,12 +115,18 @@ func main() {
 		cfg.AnonymousTokens = []string{os.Getenv("ARVADOS_API_TOKEN")}
 	}
 
+	if *dumpConfig {
+		log.Fatal(config.DumpAndExit(cfg))
+	}
+
+	log.Printf("keep-web %s started", version)
+
 	os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
 	srv := &server{Config: cfg}
 	if err := srv.Start(); err != nil {
 		log.Fatal(err)
 	}
-	if _, err := daemon.SdNotify("READY=1"); err != nil {
+	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
 		log.Printf("Error notifying init daemon: %v", err)
 	}
 	log.Println("Listening at", srv.Addr)