projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12662: Added test proving that User.current won't return the
[arvados.git]
/
services
/
keep-web
/
main.go
diff --git
a/services/keep-web/main.go
b/services/keep-web/main.go
index 2d563bd76f9e23290c03d1a9ea24fed854b7ab7b..27ceb48c78bfebbc40aa9d3732cbcbba6ad63155 100644
(file)
--- 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"
package main
import (
"flag"
"log"
"os"
+ "time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
@@
-11,7
+16,7
@@
import (
)
var (
)
var (
- defaultConfigPath = "/etc/arvados/keep-web/
config.json
"
+ defaultConfigPath = "/etc/arvados/keep-web/
keep-web.yml
"
)
// Config specifies server configuration.
)
// Config specifies server configuration.
@@
-24,15
+29,28
@@
type Config struct {
AttachmentOnlyHost string
TrustAllContent bool
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
// 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",
}
// 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,
+ },
}
}
}
}
@@
-53,7
+71,7
@@
func main() {
var configPath string
deprecated := " (DEPRECATED -- use config file instead)"
flag.StringVar(&configPath, "config", defaultConfigPath,
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,
flag.StringVar(&cfg.Listen, "listen", "",
"address:port or :port to listen on"+deprecated)
flag.BoolVar(&cfg.deprecatedAllowAnonymous, "allow-anonymous", false,
@@
-62,6
+80,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)
"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()
flag.Usage = usage
flag.Parse()
@@
-78,12
+101,16
@@
func main() {
cfg.AnonymousTokens = []string{os.Getenv("ARVADOS_API_TOKEN")}
}
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)
}
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)
log.Printf("Error notifying init daemon: %v", err)
}
log.Println("Listening at", srv.Addr)