X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/104b2b5a46844e94a37c332b4ddd5a861dd8d63d..74d98b5f5cfee651eebfd8c63842a08241dcd736:/services/ws/config.go

diff --git a/services/ws/config.go b/services/ws/config.go
index 9c2e80a172..0faa863d82 100644
--- a/services/ws/config.go
+++ b/services/ws/config.go
@@ -6,19 +6,20 @@ import (
 	"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",
 		},
@@ -30,6 +31,8 @@ func DefaultConfig() Config {
 			"connect_timeout": "30",
 			"sslmode":         "require",
 		},
+		LogLevel:         "info",
+		LogFormat:        "json",
 		PingTimeout:      arvados.Duration(time.Minute),
 		ClientEventQueue: 64,
 		ServerEventQueue: 4,