RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-15 18:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: startup: don't fork worker if started with -c -W

Browse Source 
Don't do master-worker fork if MODE_CHECK is detected from the command line along
with the master-worker mode. We should exit in MODE_CHECK, after the
configuration parsing and validation. So, with the new master-worker architecture
it's better to align this mode with the standalone.

This patch does not need to be backported, as related to the latest
master-worker rework.
This commit is contained in:
Valentine Krasnobaeva 2024-10-29 19:14:11 +01:00
parent f0f03b98f7
commit d1c6d44976
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/haproxy.c
View File

@ -3150,6 +3150,12 @@ static void read_cfg_in_discovery_mode(int argc, char **argv)
ha_alert("a master CLI socket was defined, but master-worker mode (-W) is not enabled.\n");
exit(EXIT_FAILURE);
}
/* in MODE_CHECK and in MODE_DUMP_CFG we just need to parse the
* configuration and exit, see step_init_2()
*/
if ((global.mode & MODE_MWORKER) && (global.mode & (MODE_CHECK | MODE_DUMP_CFG)))
global.mode &= ~MODE_MWORKER;
}
void deinit(void)