Skip to content

Commit 6cf395c

Browse files
authored
Merge pull request ghostunnel#577 from ghostunnel/cs/conn-timeout-default
Set default close timeout to 1s, closer to old behavior
2 parents eb719a4 + b2c57e4 commit 6cf395c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ var (
128128
timedReload = app.Flag("timed-reload", "Reload keystores every given interval (e.g. 300s), refresh listener/client on changes.").PlaceHolder("DURATION").Duration()
129129
processShutdownTimeout = app.Flag("shutdown-timeout", "Process shutdown timeout. Terminates after timeout even if connections still open.").Default("5m").Duration()
130130
connectTimeout = app.Flag("connect-timeout", "Timeout for establishing connections, handshakes.").Default("10s").Duration()
131-
closeTimeout = app.Flag("close-timeout", "Timeout for closing connections when one side terminates.").Default("10s").Duration()
131+
closeTimeout = app.Flag("close-timeout", "Timeout for closing connections when one side terminates. Zero means immediate closure.").Default("1s").Duration()
132132
maxConnLifetime = app.Flag("max-conn-lifetime", "Maximum lifetime for connections post handshake, no matter what. Zero means infinite.").Default("0s").Duration()
133133
maxConcurrentConns = app.Flag("max-concurrent-conns", "Maximum number of concurrent connections to handle in the proxy. Zero means infinite.").Default("0").Uint32()
134134

0 commit comments

Comments
 (0)