Merge branch '11629-groups-contents-memory'

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

diff --git a/services/ws/config.go b/services/ws/config.go
index 0faa863d82e361ccf8f61ed70dfb2c12a292a978..79c2f232daf5059c4b51f7d1bb2fa27a592c5f64 100644 (file)
--- a/services/ws/config.go
+++ b/services/ws/config.go
@@ -7,11 +7,12 @@ import (
 )
 
 type wsConfig struct {
-       Client    arvados.Client
-       Postgres  pgConfig
-       Listen    string
-       LogLevel  string
-       LogFormat string
+       Client       arvados.Client
+       Postgres     pgConfig
+       PostgresPool int
+       Listen       string
+       LogLevel     string
+       LogFormat    string
 
        PingTimeout      arvados.Duration
        ClientEventQueue int
@@ -24,13 +25,15 @@ func defaultConfig() wsConfig {
                        APIHost: "localhost:443",
                },
                Postgres: pgConfig{
-                       "dbname":          "arvados_production",
-                       "user":            "arvados",
-                       "password":        "xyzzy",
-                       "host":            "localhost",
-                       "connect_timeout": "30",
-                       "sslmode":         "require",
+                       "dbname":                    "arvados_production",
+                       "user":                      "arvados",
+                       "password":                  "xyzzy",
+                       "host":                      "localhost",
+                       "connect_timeout":           "30",
+                       "sslmode":                   "require",
+                       "fallback_application_name": "arvados-ws",
                },
+               PostgresPool:     64,
                LogLevel:         "info",
                LogFormat:        "json",
                PingTimeout:      arvados.Duration(time.Minute),