14717: Rename WebsocketKeepaliveTimeout to SendTimeout and add a comment

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 1a1f1c5ac5fd7cce3878035888c2c457be1f115a..595b05f8c9862304a0a677927be8524132669347 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -198,7 +198,11 @@ Clusters:
       # Maximum wall clock time to spend handling an incoming request.
       RequestTimeout: 5m
 
-      WebsocketKeepaliveTimeout: 60s
+      # Websocket will send a periodic empty event after 'SendTimeout'
+      # if there is no other activity to maintain the connection /
+      # detect dropped connections.
+      SendTimeout: 60s
+
       WebsocketClientEventQueue: 64
       WebsocketServerEventQueue: 4
 

diff --git a/lib/config/export.go b/lib/config/export.go
index 1cb84a2a18fb2e20de823f806d8f75aca261e7a7..25d1b7a2cb431bee3458f42804a3ba0b50046b34 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -65,7 +65,7 @@ var whitelist = map[string]bool{
        "API.RailsSessionSecretToken":                  false,
        "API.RequestTimeout":                           true,
        "API.WebsocketClientEventQueue":                false,
-       "API.WebsocketKeepaliveTimeout":                true,
+       "API.SendTimeout":                              true,
        "API.WebsocketServerEventQueue":                false,
        "AuditLogs":                                    false,
        "AuditLogs.MaxAge":                             false,

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 7bcb384416b239429e94e07cffe696037bfb2d55..7704a3faefdcb17da6c9310455c427336087e640 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -204,7 +204,11 @@ Clusters:
       # Maximum wall clock time to spend handling an incoming request.
       RequestTimeout: 5m
 
-      WebsocketKeepaliveTimeout: 60s
+      # Websocket will send a periodic empty event after 'SendTimeout'
+      # if there is no other activity to maintain the connection /
+      # detect dropped connections.
+      SendTimeout: 60s
+
       WebsocketClientEventQueue: 64
       WebsocketServerEventQueue: 4