about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--lib/PublicInbox/Daemon.pm4
-rwxr-xr-xscript/public-inbox-watch2
2 files changed, 3 insertions, 3 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:
diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 10c7cd6f..86349d71 100755
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -58,7 +58,7 @@ if ($watch) {
         PublicInbox::DS::requeue($scan) if $do_scan;
 
         my $sigfd = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK);
-        local %SIG = (%SIG, %$sig) if !$sigfd;
+        local @SIG{keys %$sig} = values(%$sig) unless $sigfd;
         if (!$sigfd) {
                 PublicInbox::DS::sig_setmask($oldset);
                 PublicInbox::DS->SetLoopTimeout(1000);