diff options
| author | Eric Wong <e@80x24.org> | 2019-11-24 00:22:29 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2019-11-24 21:35:18 +0000 |
| commit | 34a51e5736d7d1b7d2da7f7640eb2b87eec121ff (patch) | |
| tree | 799b53b1e4f8ea0c92254425a12b0ccaca7f9406 | |
| parent | 81a9a43fb858d197ffd1532d73f9f22739f940ff (diff) | |
| download | public-inbox-34a51e5736d7d1b7d2da7f7640eb2b87eec121ff.tar.gz | |
We need to block signals in workers during respawns until they're ready to receive signals.
| -rw-r--r-- | lib/PublicInbox/Daemon.pm | 6 |
1 files changed, 4 insertions, 2 deletions
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); } |