From 607b9adc9bd92ece2e99ab1012ddb4b8cdcd4ac6 Mon Sep 17 00:00:00 2001 From: Aurelien DARRAGON Date: Tue, 17 Sep 2024 14:24:05 +0200 Subject: [PATCH] BUG/MINOR: fix missing "log-format overrides previous 'option tcplog clf'..." detection In commit fd48b28315 ("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 fd48b28315 is. --- src/cfgparse-listen.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 0c59549f1..876a5da95 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -2699,6 +2699,8 @@ stats_error_parsing: oldlogformat = "option httplog"; else if (curproxy->logformat.str == default_tcp_log_format) oldlogformat = "option tcplog"; + else if (curproxy->logformat.str == clf_tcp_log_format) + oldlogformat = "option tcplog clf"; else if (curproxy->logformat.str == clf_http_log_format) oldlogformat = "option httplog clf"; else if (curproxy->logformat.str == default_https_log_format)