BUG/MINOR: cfgparse-listen: fix option httpslog override warning message

Darlelet · Darlelet · commit 17e52c922b57 · 2024-09-17T15:40:02.000+02:00
"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
diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
@@ -2214,7 +2214,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 					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);

Original file line number	Diff line number	Diff line change
`@@ -2214,7 +2214,7 @@ int cfg_parse_listen(const char file, int linenum, char *args, int kwm)`
`2214`	`2214`	`oldlogformat = "option httplog clf";`
`2215`	`2215`	`else if (curproxy->logformat.str == default_https_log_format)`
`2216`	`2216`	`oldlogformat = "option httpslog";`
`2217`		`- ha_warning("parsing [%s:%d]: 'option httplog' overrides previous '%s' in 'defaults' section.\n",`
	`2217`	`+ ha_warning("parsing [%s:%d]: 'option httpslog' overrides previous '%s' in 'defaults' section.\n",`
`2218`	`2218`	`file, linenum, oldlogformat);`
`2219`	`2219`	`}`
`2220`	`2220`	`lf_expr_deinit(&curproxy->logformat);`