Commit 077a1965 authored by antirez's avatar antirez
Browse files

Better SIGCHLD handling for #2897 debugging.

parent 4f7d1e46
......@@ -152,6 +152,7 @@ void *bioProcessBackgroundJobs(void *arg) {
* receive the watchdog signal. */
sigemptyset(&sigset);
sigaddset(&sigset, SIGALRM);
sigaddset(&sigset, SIGCHLD);
if (pthread_sigmask(SIG_BLOCK, &sigset, NULL))
redisLog(REDIS_WARNING,
"Warning: can't mask SIGALRM in bio.c thread: %s", strerror(errno));
......
......@@ -1761,7 +1761,8 @@ void initServer(void) {
int j;
signal(SIGHUP, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
signal(SIGPIPE, SIG_IGN); /* No write(2) generated signals. */
signal(SIGCHLD, SIG_DFL); /* We want zombies to queue for waitpid(). */
setupSignalHandlers();
if (server.syslog_enabled) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment