projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13547: Merge branch 'master' into 13547-respect-insecure-flag-when-talking-ssl-to...
[arvados.git]
/
services
/
keep-web
/
main.go
diff --git
a/services/keep-web/main.go
b/services/keep-web/main.go
index 585dab13e3cbf0ce68ef620c6dad31e4a17c974b..d09fce706c4a50033649b32df152afa30ab85dc6 100644
(file)
--- a/
services/keep-web/main.go
+++ b/
services/keep-web/main.go
@@
-6,17
+6,19
@@
package main
import (
"flag"
import (
"flag"
- "
log
"
+ "
fmt
"
"os"
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
"os"
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
+ log "github.com/Sirupsen/logrus"
"github.com/coreos/go-systemd/daemon"
)
var (
defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
"github.com/coreos/go-systemd/daemon"
)
var (
defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
+ version = "dev"
)
// Config specifies server configuration.
)
// Config specifies server configuration.
@@
-45,6
+47,7
@@
func DefaultConfig() *Config {
Listen: ":80",
Cache: cache{
TTL: arvados.Duration(5 * time.Minute),
Listen: ":80",
Cache: cache{
TTL: arvados.Duration(5 * time.Minute),
+ UUIDTTL: arvados.Duration(5 * time.Second),
MaxCollectionEntries: 1000,
MaxCollectionBytes: 100000000,
MaxPermissionEntries: 1000,
MaxCollectionEntries: 1000,
MaxCollectionBytes: 100000000,
MaxPermissionEntries: 1000,
@@
-62,6
+65,10
@@
func init() {
if os.Getenv("ARVADOS_API_TOKEN") == "" {
os.Setenv("ARVADOS_API_TOKEN", "xxx")
}
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() {
}
func main() {
@@
-84,9
+91,17
@@
func main() {
dumpConfig := flag.Bool("dump-config", false,
"write current configuration to stdout and exit")
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()
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.")
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
+119,8
@@
func main() {
log.Fatal(config.DumpAndExit(cfg))
}
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 {
os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
srv := &server{Config: cfg}
if err := srv.Start(); err != nil {