X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/589de3bdd1e9f4f7a2cc64ad502e4d8e77cdd2c8..386e1eefaac2021805f73732b10e9f543c221593:/services/keep-web/main.go diff --git a/services/keep-web/main.go b/services/keep-web/main.go index 13d8c1b329..585dab13e3 100644 --- a/services/keep-web/main.go +++ b/services/keep-web/main.go @@ -1,9 +1,14 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + package main import ( "flag" "log" "os" + "time" "git.curoverse.com/arvados.git/sdk/go/arvados" "git.curoverse.com/arvados.git/sdk/go/config" @@ -24,15 +29,27 @@ 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), + MaxCollectionEntries: 1000, + MaxCollectionBytes: 100000000, + MaxPermissionEntries: 1000, + MaxUUIDEntries: 1000, + }, } } @@ -62,6 +79,11 @@ 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") flag.Usage = usage flag.Parse() @@ -78,12 +100,16 @@ func main() { cfg.AnonymousTokens = []string{os.Getenv("ARVADOS_API_TOKEN")} } + if *dumpConfig { + log.Fatal(config.DumpAndExit(cfg)) + } + 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)