Skip to content

Commit 607b9ad

Browse files
committed
BUG/MINOR: fix missing "log-format overrides previous 'option tcplog clf'..." detection
In commit fd48b28 ("MINOR: Implements new log format of option tcplog clf") "option tcplog clf" detection was correcly added for "option tcplog" and "option httplog", but "log-format" case was overlooked. Thus, this config would report erroneous warning message: defaults option tcplog clf log-format "ok" [WARNING] (727893) : config : parsing [test.conf:3]: 'log-format' overrides previous 'log-format' in 'defaults' section. No backport needed unless fd48b28 is.
1 parent 499e057 commit 607b9ad

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/cfgparse-listen.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2699,6 +2699,8 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
26992699
oldlogformat = "option httplog";
27002700
else if (curproxy->logformat.str == default_tcp_log_format)
27012701
oldlogformat = "option tcplog";
2702+
else if (curproxy->logformat.str == clf_tcp_log_format)
2703+
oldlogformat = "option tcplog clf";
27022704
else if (curproxy->logformat.str == clf_http_log_format)
27032705
oldlogformat = "option httplog clf";
27042706
else if (curproxy->logformat.str == default_https_log_format)

0 commit comments

Comments
 (0)