1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MINOR: config: silence .notice/.warning/.alert in discovery mode

Browse Source 
When first pre-parsing the config to detect the presence or absence of
the master mode, we must not emit messages because they are not supposed
to be visible at this point, otherwise they appear twice each. The
pre-parsing, also called discovery mode, is only for internal use,
thus it should remain silent.

This should be backported to 3.1 where this mode was introduced.
This commit is contained in:
Willy Tarreau 2025-04-01 09:06:25 +02:00
parent 9f00702dc6
commit 2c779f3938
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cfgparse.c
View File

@ -2506,7 +2506,7 @@ next_line:
} }
/* .warning/.error/.notice/.diag */ /* .warning/.error/.notice/.diag */
if (*args[0] == '.') { if (*args[0] == '.' && !(global.mode & MODE_DISCOVERY)) {
if (strcmp(args[0], ".alert") == 0) { if (strcmp(args[0], ".alert") == 0) {
if (*args[2]) { if (*args[2]) {
ha_alert("parsing [%s:%d]: Unexpected argument '%s' for '%s'. Use quotes if the message should contain spaces.\n", ha_alert("parsing [%s:%d]: Unexpected argument '%s' for '%s'. Use quotes if the message should contain spaces.\n",