From: Willy Tarreau <w@1wt.eu>
Date: Sat, 27 Feb 2016 07:20:17 +0000 (+0100)
Subject: BUG/MINOR: systemd: propagate the correct signal to haproxy
X-Git-Tag: v1.7-dev2~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c2f7955e7300fb2cf0596fa5210cdeb3a2aea5f;p=thirdparty%2Fhaproxy.git

BUG/MINOR: systemd: propagate the correct signal to haproxy

Some people report that sometimes there's a collection of old processes
after a restart of the systemd wrapper. It's not surprizing when reading
the code, the SIGTERM is propagated as a SIGINT which asks for a graceful
stop instead. If people ask for termination, we should terminate.
---

diff --git a/src/haproxy-systemd-wrapper.c b/src/haproxy-systemd-wrapper.c
index 42b0b0791b..0c076a6a41 100644
--- a/src/haproxy-systemd-wrapper.c
+++ b/src/haproxy-systemd-wrapper.c
@@ -147,7 +147,7 @@ static void do_shutdown(int sig)
 		if (pid > 0) {
 			fprintf(stderr, SD_DEBUG "haproxy-systemd-wrapper: %s -> %d.\n",
 			        sig == SIGTERM ? "SIGTERM" : "SIGINT", pid);
-			kill(pid, SIGINT);
+			kill(pid, sig);
 			free(pid_strv[i]);
 		}
 	}