From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Tue, 3 Dec 2024 20:13:29 +0000 (+0100)
Subject: CLEANUP: startup: make if condition to kill old pids more readable
X-Git-Tag: v3.2-dev1~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f24e57d717a96a4e031fb1b4691c8b4887c1f575;p=thirdparty%2Fhaproxy.git

CLEANUP: startup: make if condition to kill old pids more readable

Update comment and condition. nb_oldpids it's not a pointer, but a signed int,
which keeps the max number of elements in oldpids array. So, it's a good
practice to check, if it's strictly positive here.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 120822ba6f..34c29d1704 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3552,10 +3552,15 @@ int main(int argc, char **argv)
 
 	ha_free(&global.chroot);
 
-	/* In master-worker mode master sends TERM to previous workers up to
-	 * receiving status READY
+
+	/* In standalone mode send USR1/TERM to the previous worker,
+	 * launched with -sf $(cat pidfile).
+	 * In master-worker mode, see _send_status(): master process sends
+	 * USR1/TERM to previous workers up to receiving status READY from the
+	 * worker, which is newly forked. Then master sends USR1 or TERM to previous
+	 * master, if it was launched with (-W -D -sf $(cat pidfile).
 	 */
-	if (!(global.mode & MODE_MWORKER) && nb_oldpids) {
+	if (!(global.mode & MODE_MWORKER) && (nb_oldpids > 0)) {
 		nb_oldpids = tell_old_pids(oldpids_sig);
 	}