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

MEDIUM: mworker: remove register/unregister signal functions

Browse Source 
Remove the register and unregister signal functions specifics to the
master worker, because that should be done with the generic ones.
This commit is contained in:
William Lallemand 2018-09-11 10:06:17 +02:00 committed by Willy Tarreau
parent 4bc7d90d3b
commit 73e1dfcfdf
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/haproxy.c
View File

@ -486,21 +486,6 @@ static void mworker_signalhandler(int signum)
caught_signal = signum; caught_signal = signum;
} }
static void mworker_register_signals()
{
struct sigaction sa;
/* Here we are not using the haproxy async way
for signals because it does not exists in
the master */
memset(&sa, 0, sizeof(struct sigaction));
sa.sa_handler = &mworker_signalhandler;
sigaction(SIGHUP, &sa, NULL);
sigaction(SIGUSR1, &sa, NULL);
sigaction(SIGUSR2, &sa, NULL);
sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
}
static void mworker_block_signals() static void mworker_block_signals()
{ {
sigset_t set; sigset_t set;
@ -527,15 +512,6 @@ static void mworker_unblock_signals()
ha_sigmask(SIG_UNBLOCK, &set, NULL); ha_sigmask(SIG_UNBLOCK, &set, NULL);
} }
static void mworker_unregister_signals()
{
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
signal(SIGHUP, SIG_IGN);
signal(SIGUSR1, SIG_IGN);
signal(SIGUSR2, SIG_IGN);
}
/* /*
* Send signal to every known children. * Send signal to every known children.
*/ */
@ -661,7 +637,6 @@ static void mworker_reload()
char *msg = NULL; char *msg = NULL;
mworker_block_signals(); mworker_block_signals();
mworker_unregister_signals();
#if defined(USE_SYSTEMD) #if defined(USE_SYSTEMD)
if (global.tune.options & GTUNE_USE_SYSTEMD) if (global.tune.options & GTUNE_USE_SYSTEMD)
sd_notify(0, "RELOADING=1"); sd_notify(0, "RELOADING=1");
@ -734,7 +709,6 @@ restart_wait:
sd_notifyf(0, "READY=1\nMAINPID=%lu", (unsigned long)getpid()); sd_notifyf(0, "READY=1\nMAINPID=%lu", (unsigned long)getpid());
#endif #endif
mworker_register_signals();
mworker_unblock_signals(); mworker_unblock_signals();
while (1) { while (1) {
@ -753,7 +727,6 @@ restart_wait:
#endif #endif
ha_warning("Exiting Master process...\n"); ha_warning("Exiting Master process...\n");
mworker_kill(sig); mworker_kill(sig);
mworker_unregister_signals();
} }
caught_signal = 0; caught_signal = 0;
} }