From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Wed, 9 Oct 2024 21:11:36 +0000 (+0200)
Subject: MINOR: startup: reintroduce program support
X-Git-Tag: v3.1-dev10~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fc2ff4b7db76d0f8364876ce078f0960309ec69;p=thirdparty%2Fhaproxy.git

MINOR: startup: reintroduce program support

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.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index b934850cf2..d88d5fa27c 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -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) {