X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3ad999b1f769ef53d1bf069a5981db959b33b9d4..987457b7e545f4ad1e32c7a07c00c29c24326421:/services/keep-web/main.go diff --git a/services/keep-web/main.go b/services/keep-web/main.go index 585dab13e3..724af27c7e 100644 --- a/services/keep-web/main.go +++ b/services/keep-web/main.go @@ -6,6 +6,7 @@ package main import ( "flag" + "fmt" "log" "os" "time" @@ -17,6 +18,7 @@ import ( var ( defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml" + version = "dev" ) // Config specifies server configuration. @@ -45,6 +47,7 @@ func DefaultConfig() *Config { Listen: ":80", Cache: cache{ TTL: arvados.Duration(5 * time.Minute), + UUIDTTL: arvados.Duration(5 * time.Second), MaxCollectionEntries: 1000, MaxCollectionBytes: 100000000, MaxPermissionEntries: 1000, @@ -84,9 +87,17 @@ func main() { 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.") @@ -104,6 +115,8 @@ func main() { 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 {