mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: mworker: never block SIG{TERM,INT} during reload

Browse Source 
The master should be able to be killed even if the reload is not
finished.
This commit is contained in:
William Lallemand 2018-09-11 10:06:22 +02:00 committed by Willy Tarreau
parent ebf304f8dd
commit 242aae96c7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/haproxy.c
View File

@ -491,8 +491,6 @@ static void mworker_block_signals()
sigaddset(&set, SIGUSR1); sigaddset(&set, SIGUSR1);
sigaddset(&set, SIGUSR2); sigaddset(&set, SIGUSR2);
sigaddset(&set, SIGHUP); sigaddset(&set, SIGHUP);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGTERM);
sigaddset(&set, SIGCHLD); sigaddset(&set, SIGCHLD);
ha_sigmask(SIG_SETMASK, &set, NULL); ha_sigmask(SIG_SETMASK, &set, NULL);
} }
@ -505,8 +503,6 @@ static void mworker_unblock_signals()
sigaddset(&set, SIGUSR1); sigaddset(&set, SIGUSR1);
sigaddset(&set, SIGUSR2); sigaddset(&set, SIGUSR2);
sigaddset(&set, SIGHUP); sigaddset(&set, SIGHUP);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGTERM);
sigaddset(&set, SIGCHLD); sigaddset(&set, SIGCHLD);
ha_sigmask(SIG_UNBLOCK, &set, NULL); ha_sigmask(SIG_UNBLOCK, &set, NULL);
} }