diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2022-05-21 10:19:35 +0400 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2022-05-21 10:20:08 +0400 |
| commit | bf701bbb55889e074be2c97f7c5155d1cfd855d7 (patch) | |
| tree | 65662c80954e67e5ce73e0114000092700e4aaef | |
| parent | 569ae36d384b587127f47b72985a5cbbb0f118b7 (diff) | |
| download | gitlab-shell-id-disable-client-interval-by-default.tar.gz | |
Disable ClientAliveInterval by defaultid-disable-client-interval-by-default
It was added to fix context canceled issue, but since the issue
has been fixed differently, let's disable it by default
| -rw-r--r-- | config.yml.example | 2 | ||||
| -rw-r--r-- | internal/config/config.go | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config.yml.example b/config.yml.example index 1fdb6f9..60fd9aa 100644 --- a/config.yml.example +++ b/config.yml.example @@ -76,7 +76,7 @@ sshd: web_listen: "localhost:9122" # Maximum number of concurrent sessions allowed on a single SSH connection. Defaults to 10. concurrent_sessions_limit: 10 - # Sets an interval after which server will send keepalive message to a client + # Sets an interval after which server will send keepalive message to a client. Disabled by default client_alive_interval: 15 # The server waits for this time (in seconds) for the ongoing connections to complete before shutting down. Defaults to 10. grace_period: 10 diff --git a/internal/config/config.go b/internal/config/config.go index 9e95931..fab3f34 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -86,7 +86,6 @@ var ( WebListen: "localhost:9122", ConcurrentSessionsLimit: 10, GracePeriod: yamlDuration(10 * time.Second), - ClientAliveInterval: yamlDuration(15 * time.Second), ProxyHeaderTimeout: yamlDuration(500 * time.Millisecond), ReadinessProbe: "/start", LivenessProbe: "/health", |