]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
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)
committerAurelien DARRAGON <adarragon@haproxy.com>
Tue, 17 Sep 2024 13:40:02 +0000 (15:40 +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

src/cfgparse-listen.c

index 183eee5e387ae73e9fc3155dfa369ed3675407c9..310951616923353ed301113a4b8bef501bfe7d94 100644 (file)
@@ -2214,7 +2214,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);