Skip to content

Commit

Permalink
BUG/MINOR: cfgparse-listen: fix option httpslog override warning message
Browse files Browse the repository at this point in the history
"option httpslog" override warning messaged used to be reported as
"option httplog", probably as a result of copy paste without adjusting
the context. Let's fix that to prevent emitting confusing warning messages

The issue exists since 98b930d ("MINOR: ssl: Define a default https log
format"), thus it should be backported up to 2.6

(cherry picked from commit 17e52c9)
Signed-off-by: Willy Tarreau <[email protected]>
(cherry picked from commit 5ac8a0b)
Signed-off-by: Willy Tarreau <[email protected]>
(cherry picked from commit a9a0eb2)
Signed-off-by: Willy Tarreau <[email protected]>
(cherry picked from commit e1e27bc)
Signed-off-by: Willy Tarreau <[email protected]>
  • Loading branch information
Darlelet authored and wtarreau committed Sep 18, 2024
1 parent 52a6ad3 commit ffbc1c6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cfgparse-listen.c
Original file line number Diff line number Diff line change
Expand Up @@ -2195,7 +2195,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
oldlogformat = "option httplog clf";
else if (curproxy->conf.logformat_string == default_https_log_format)
oldlogformat = "option httpslog";
ha_warning("parsing [%s:%d]: 'option httplog' overrides previous '%s' in 'defaults' section.\n",
ha_warning("parsing [%s:%d]: 'option httpslog' overrides previous '%s' in 'defaults' section.\n",
file, linenum, oldlogformat);
}
if (curproxy->conf.logformat_string != default_http_log_format &&
Expand Down

0 comments on commit ffbc1c6

Please sign in to comment.