Merge branch '10669-safe-http-cache'

[arvados.git] / services / ws / config.go

diff --git a/services/ws/config.go b/services/ws/config.go
index 9a2bb3c9798c7cead9bdddc46737aa8f6730c4d0..0faa863d82e361ccf8f61ed70dfb2c12a292a978 100644 (file)
--- a/services/ws/config.go
+++ b/services/ws/config.go
@@ -1,32 +1,40 @@
 package main
 
 import (
+       "time"
+
        "git.curoverse.com/arvados.git/sdk/go/arvados"
 )
 
-type Config struct {
-       Client   arvados.Client
-       Postgres pgConfig
-       Listen   string
-       Debug    bool
+type wsConfig struct {
+       Client    arvados.Client
+       Postgres  pgConfig
+       Listen    string
+       LogLevel  string
+       LogFormat string
 
+       PingTimeout      arvados.Duration
        ClientEventQueue int
        ServerEventQueue int
 }
 
-func DefaultConfig() Config {
-       return Config{
+func defaultConfig() wsConfig {
+       return wsConfig{
                Client: arvados.Client{
                        APIHost: "localhost:443",
                },
                Postgres: pgConfig{
-                       "dbname":          "arvados_test",
+                       "dbname":          "arvados_production",
                        "user":            "arvados",
                        "password":        "xyzzy",
                        "host":            "localhost",
                        "connect_timeout": "30",
-                       "sslmode":         "disable",
+                       "sslmode":         "require",
                },
+               LogLevel:         "info",
+               LogFormat:        "json",
+               PingTimeout:      arvados.Duration(time.Minute),
                ClientEventQueue: 64,
+               ServerEventQueue: 4,
        }
 }