mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 17:17:06 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: systemd-wrapper: Kill child processes when interrupted

Browse Source 
Send SIGINT to child processes when killed. This ensures that
the haproxy process managed by the systemd-wrapper is stopped
when "systemctl stop haproxy.service" is called.
This commit is contained in:
Kristoffer Grnlund 2013-11-22 11:09:39 +01:00 committed by Willy Tarreau
parent 1b6e75fa84
commit 66fd1d830e
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/haproxy-systemd-wrapper.c
View File

@ -83,7 +83,7 @@ static int read_pids(char ***pid_strv)
return read; return read;
} }
static void signal_handler(int signum __attribute__((unused))) static void sigusr2_handler(int signum __attribute__((unused)))
{ {
int i; int i;
char **pid_strv = NULL; char **pid_strv = NULL;
@ -96,6 +96,21 @@ static void signal_handler(int signum __attribute__((unused)))
free(pid_strv); free(pid_strv);
} }
static void sigint_handler(int signum __attribute__((unused)))
{
int i, pid;
char **pid_strv = NULL;
int nb_pid = read_pids(&pid_strv);
for (i = 0; i < nb_pid; ++i) {
pid = atoi(pid_strv[i]);
if (pid > 0) {
kill(pid, SIGINT);
free(pid_strv[i]);
}
}
free(pid_strv);
}
static void init(int argc, char **argv) static void init(int argc, char **argv)
{ {
while (argc > 1) { while (argc > 1) {
@ -117,7 +132,8 @@ int main(int argc, char **argv)
init(argc, argv); init(argc, argv);
signal(SIGUSR2, &signal_handler); signal(SIGINT, &sigint_handler);
signal(SIGUSR2, &sigusr2_handler);
spawn_haproxy(NULL, 0); spawn_haproxy(NULL, 0);
while (-1 != wait(NULL) || errno == EINTR); while (-1 != wait(NULL) || errno == EINTR);