mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: fix missing "log-format overrides previous 'option tcplog clf'..." detection

Browse Source 
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.
This commit is contained in:
Aurelien DARRAGON 2024-09-17 14:24:05 +02:00
parent 499e057644
commit 607b9adc9b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cfgparse-listen.c
View File

@ -2699,6 +2699,8 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
oldlogformat = "option httplog"; oldlogformat = "option httplog";
else if (curproxy->logformat.str == default_tcp_log_format) else if (curproxy->logformat.str == default_tcp_log_format)
oldlogformat = "option tcplog"; 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) else if (curproxy->logformat.str == clf_http_log_format)
oldlogformat = "option httplog clf"; oldlogformat = "option httplog clf";
else if (curproxy->logformat.str == default_https_log_format) else if (curproxy->logformat.str == default_https_log_format)