treewide: fix %SIG localization, harder

[public-inbox.git] / lib / PublicInbox / IPC.pm

diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index add5f3dfd1d4a6377077a5ebbe414ded1f0215c7..3e29def87bf57de2f47b7593fa7600f1aad2275c 100644 (file)
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -115,7 +115,7 @@ sub ipc_worker_spawn {
                        $fields //= {};
                        local @$self{keys %$fields} = values(%$fields);
                        my $on_destroy = $self->ipc_atfork_child;
-                       local %SIG = %SIG;
+                       local @SIG{keys %SIG} = values %SIG;
                        PublicInbox::DS::sig_setmask($sigset);
                        ipc_worker_loop($self, $r_req, $w_res);
                };
@@ -353,14 +353,15 @@ sub _wq_worker_start ($$$$) {
                                keys %{delete($self->{-wq_workers}) // {}};
                $SIG{$_} = 'IGNORE' for (qw(PIPE));
                $SIG{$_} = 'DEFAULT' for (qw(TTOU TTIN TERM QUIT INT CHLD));
-               local $0 = "$self->{-wq_ident} $self->{-wq_worker_nr}";
+               local $0 = $one ? $self->{-wq_ident} :
+                       "$self->{-wq_ident} $self->{-wq_worker_nr}";
                # ensure we properly exit even if warn() dies:
                my $end = PublicInbox::OnDestroy->new($$, sub { exit(!!$@) });
                eval {
                        $fields //= {};
                        local @$self{keys %$fields} = values(%$fields);
                        my $on_destroy = $self->ipc_atfork_child;
-                       local %SIG = %SIG;
+                       local @SIG{keys %SIG} = values %SIG;
                        PublicInbox::DS::sig_setmask($oldset);
                        wq_worker_loop($self, $bcast2);
                };