BUG/MINOR: cfgparse-listen: fix option httpslog override warning message
authorAurelien DARRAGON <adarragon@haproxy.com>
Tue, 17 Sep 2024 13:34:44 +0000 (15:34 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 18 Sep 2024 12:49:31 +0000 (14:49 +0200)
"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 17e52c922b577e1b677098b34e47cd0a85f31e8b)
Signed-off-by: Willy Tarreau <w@1wt.eu>

src/cfgparse-listen.c

index 9ee8174..04c311d 100644 (file)
@@ -2169,7 +2169,7 @@ stats_error_parsing:
                                        oldlogformat = "option httplog clf";
                                else if (curproxy->logformat.str == 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);
                        }
                        lf_expr_deinit(&curproxy->logformat);