From: Christopher Faulet Date: Mon, 24 Oct 2022 13:53:01 +0000 (+0200) Subject: BUG/MINOR: sink: Set default connect/server timeout for implicit ring buffers X-Git-Tag: v2.7-dev9~135 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d08a25b1f125eaf79475d8e42f2eb51683bf91a0;p=thirdparty%2Fhaproxy.git BUG/MINOR: sink: Set default connect/server timeout for implicit ring buffers Ring buffers may be implicitly created from log declarations when "tcp@", "tcp6@", "tcp4@" or "uxst@" prefixes are used. These ring buffers rely on unconfigurable proxies. While connect and server timeouts should be defined for explicit ring buffers, it is no possible for implicit ones. However, a default value must be set and TICK_ETERNITY is not an acceptable one. Thus, now "1s" is set for the connect timeout and "5s" is set for server one. This patch may be backported as far as 2.4. --- diff --git a/src/sink.c b/src/sink.c index 376f34bbd5..de1e9cfbf4 100644 --- a/src/sink.c +++ b/src/sink.c @@ -1095,6 +1095,10 @@ struct sink *sink_new_from_logsrv(struct logsrv *logsrv) p->conf.args.file = p->conf.file = strdup(logsrv->conf.file); p->conf.args.line = p->conf.line = logsrv->conf.line; + /* Set default connect and server timeout */ + p->timeout.connect = MS_TO_TICKS(1000); + p->timeout.server = MS_TO_TICKS(5000); + /* allocate a new server to forward messages * from ring buffer */