From 34a51e5736d7d1b7d2da7f7640eb2b87eec121ff Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sun, 24 Nov 2019 00:22:29 +0000
Subject: daemon: use sigprocmask when respawning workers

We need to block signals in workers during respawns
until they're ready to receive signals.
---
 lib/PublicInbox/Daemon.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/PublicInbox/Daemon.pm')

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index e830a98f..90f11137 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -19,7 +19,7 @@ require PublicInbox::EvCleanup;
 require PublicInbox::Listener;
 require PublicInbox::ParentPipe;
 my @CMD;
-my ($set_user, $oldset);
+my ($set_user, $oldset, $newset);
 my (@cfg_listen, $stdout, $stderr, $group, $user, $pid_file, $daemonize);
 my $worker_processes = 1;
 my @listeners;
@@ -77,7 +77,7 @@ sub accept_tls_opt ($) {
 sub daemon_prepare ($) {
 	my ($default_listen) = @_;
 	$oldset = POSIX::SigSet->new();
-	my $newset = POSIX::SigSet->new();
+	$newset = POSIX::SigSet->new();
 	$newset->fillset or die "fillset: $!";
 	sigprocmask(SIG_SETMASK, $newset, $oldset) or die "sigprocmask: $!";
 	@CMD = ($0, @ARGV);
@@ -536,6 +536,7 @@ sub master_loop {
 			}
 			$n = $worker_processes;
 		}
+		sigprocmask(SIG_SETMASK, $newset) or die "sigprocmask: $!";
 		foreach my $i ($n..($worker_processes - 1)) {
 			my $pid = fork;
 			if (!defined $pid) {
@@ -548,6 +549,7 @@ sub master_loop {
 				$pids{$pid} = $i;
 			}
 		}
+		sigprocmask(SIG_SETMASK, $oldset) or die "sigprocmask: $!";
 		# just wait on signal events here:
 		sysread($r, my $buf, 8);
 	}
-- 
cgit v1.2.3-24-ge0c7