lei + ipc: simplify process reaping

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

diff --git a/lib/PublicInbox/LeiPmdir.pm b/lib/PublicInbox/LeiPmdir.pm
index 59cf886e1526854db0755429b59ac2dba445e8aa..f9b68fc2a2d83b660f6101d97fc20e96136f3f45 100644 (file)
--- a/lib/PublicInbox/LeiPmdir.pm
+++ b/lib/PublicInbox/LeiPmdir.pm
@@ -32,7 +32,8 @@ sub new {
 sub ipc_atfork_child {
        my ($self) = @_;
        my $ipt = $self->{ipt} // die 'BUG: no self->{ipt}';
-       $ipt->{lei} = $self->{lei};
+       my $lei = $ipt->{lei} = $self->{lei};
+       delete @$lei{qw(auth net)}; # no network access in this worker
        $ipt->ipc_atfork_child; # calls _lei_atfork_child;
 }
 
@@ -46,17 +47,10 @@ sub mdir_iter { # via wq_io_do
        $self->{ipt}->pmdir_cb($f, $fl, @args);
 }
 
-sub pmd_done_wait {
-       my ($arg, $pid) = @_;
-       my ($self, $lei) = @$arg;
-       $lei->can('wq_done_wait')->($arg, $pid);
-}
-
 sub _lei_wq_eof { # EOF callback for main lei daemon
        my ($lei) = @_;
        my $pmd = delete $lei->{pmd} or return $lei->fail;
        $lei->sto_done_request($pmd->{lei_sock});
-       $pmd->wq_wait_old(\&pmd_done_wait, $lei);
 }
 
 1;