diff options
| -rw-r--r-- | lib/PublicInbox/Daemon.pm | 4 | ||||
| -rw-r--r-- | lib/PublicInbox/ParentPipe.pm | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm index cf011a20..2b7ac266 100644 --- a/lib/PublicInbox/Daemon.pm +++ b/lib/PublicInbox/Daemon.pm @@ -252,13 +252,11 @@ sub daemonize () { sub worker_quit { - my ($reason) = @_; # killing again terminates immediately: exit unless @listeners; $_->close foreach @listeners; # call PublicInbox::DS::close @listeners = (); - $reason->close if ref($reason) eq 'PublicInbox::ParentPipe'; my $proc_name; my $warn = 0; @@ -590,7 +588,7 @@ sub daemon_loop ($$$$) { } else { reopen_logs(); $set_user->() if $set_user; - $SIG{USR2} = sub { worker_quit('USR2') if upgrade() }; + $SIG{USR2} = sub { worker_quit() if upgrade() }; $refresh->(); } $uid = $gid = undef; diff --git a/lib/PublicInbox/ParentPipe.pm b/lib/PublicInbox/ParentPipe.pm index 6ef51c1a..2e2abb5f 100644 --- a/lib/PublicInbox/ParentPipe.pm +++ b/lib/PublicInbox/ParentPipe.pm @@ -19,6 +19,9 @@ sub new ($$$) { } # master process died, time to call worker_quit ourselves -sub event_step { $_[0]->{cb}->($_[0]) } +sub event_step { + $_[0]->close; # PublicInbox::DS::close + $_[0]->{cb}->(); +} 1; |