upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MINOR: startup: reintroduce program support

Browse source 
This patch is a part of series to reintroduce the program support in the new
master-worker architecture.

Let's add here mworker_ext_launch_all() call before master-worker fork to
start external programs. We keep the order and the place of these two forks
(program and master-worker) the same as before the refactoring, in order to
avoid regressions.
This commit is contained in:
Valentine Krasnobaeva 2024-10-09 23:11:36 +02:00 committed by Willy Tarreau
parent a2fac5a3a1
commit 0fc2ff4b7d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/haproxy.c
View file

@ -3751,9 +3751,13 @@ int main(int argc, char **argv)
if ((global.mode & MODE_DAEMON || global.mode & MODE_MWORKER) && global.pidfile != NULL)
handle_pidfile();
/* Master-worker fork */
if (global.mode & MODE_MWORKER)
/* Master-worker and program forks */
if (global.mode & MODE_MWORKER) {
/* fork and run binary from command keyword in program section */
mworker_ext_launch_all();
/* fork worker */
apply_master_worker_mode();
}
/* Worker, daemon, foreground modes read the rest of the config */
if (!master) {