lei_xsearch: transfer 4 FDs internally, drop IO::FDPass

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 9a383cef0ea98ef928d145c1869052cd8a21b82a..2f4b99e58a4d2f1004eb014bbf77e02a927a9429 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -80,14 +80,14 @@ sub lei_q {
        if ($self->{sock}) {
                $self->atfork_prepare_wq($lxs);
                $lxs->wq_workers_start('lei_xsearch', $j, $self->oldset)
-                       // $self->wq_workers($j);
+                       // $lxs->wq_workers($j);
        }
        unshift(@srcs, $sto->search) if $opt->{'local'};
        my $out = $opt->{output} // '-';
        $out = 'json:/dev/stdout' if $out eq '-';
        my $isatty = -t $self->{1};
        # no forking workers after this
-       my $pid_old12 = $self->start_pager if $isatty;
+       $self->start_pager if $isatty;
        my $json = substr($out, 0, 5) eq 'json:' ?
                ref(PublicInbox::Config->json)->new : undef;
        if ($json) {
@@ -125,10 +125,6 @@ sub lei_q {
        # my $wcb = PublicInbox::LeiToMail->write_cb($out, $self);
        $self->{mset_opt} = \%mset_opt;
        $lxs->do_query($self, \@srcs);
-       if ($pid_old12) {
-               $self->{$_} = $pid_old12->[$_] for (1, 2);
-               dwaitpid($pid_old12->[0], undef, $self->{sock});
-       }
 }
 
 1;