diff options
| author | Eric Wong <e@80x24.org> | 2021-01-13 19:06:16 -1200 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-01-14 23:14:08 +0000 |
| commit | b552bb9150775fe4b5a9eb76803e8859c647be92 (patch) | |
| tree | 56e48222cd16481c6f4bc53a130f4c68e0628794 /lib/PublicInbox/Daemon.pm | |
| parent | 39d44555e3f04c97e98c7f5d3538bbba6a19656b (diff) | |
| download | public-inbox-b552bb9150775fe4b5a9eb76803e8859c647be92.tar.gz | |
It turns out "local" did not take effect in the way we used it: http://nntp.perl.org/group/perl.perl5.porters/258784 <CAHhgV8hPbcmkzWizp6Vijw921M5BOXixj4+zTh3nRS9vRBYk8w@mail.gmail.com> Fortunately, none of the old use cases seem affected, unlike the previous lei change to ensure consistent SIGPIPE handling.
Diffstat (limited to 'lib/PublicInbox/Daemon.pm')
| -rw-r--r-- | lib/PublicInbox/Daemon.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm index 4b738b7c..f5543c85 100644 --- a/lib/PublicInbox/Daemon.pm +++ b/lib/PublicInbox/Daemon.pm @@ -514,7 +514,7 @@ EOF CHLD => \&reap_children, }; my $sigfd = PublicInbox::Sigfd->new($sig, 0); - local %SIG = (%SIG, %$sig) if !$sigfd; + local @SIG{keys %$sig} = values(%$sig) unless $sigfd; PublicInbox::DS::sig_setmask($oldset) if !$sigfd; while (1) { # main loop my $n = scalar keys %pids; @@ -628,7 +628,7 @@ sub daemon_loop ($$$$) { PublicInbox::Listener->new($_, $tls_cb || $post_accept) } @listeners; my $sigfd = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK); - local %SIG = (%SIG, %$sig) if !$sigfd; + local @SIG{keys %$sig} = values(%$sig) unless $sigfd; if (!$sigfd) { # wake up every second to accept signals if we don't # have signalfd or IO::KQueue: |