ipc: drop awaitpid_init to avoid circular refs

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

diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm
index b8a9836075ba48148032d792d4788bb0b9d1ce8b..cd2337b492d71dda9dd816bb8306145600a62fa6 100644 (file)
--- a/lib/PublicInbox/LeiUp.pm
+++ b/lib/PublicInbox/LeiUp.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # "lei up" - updates the result of "lei q --save"
@@ -7,7 +7,7 @@ use strict;
 use v5.10.1;
 # n.b. we use LeiInput to setup IMAP auth
 use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
-use PublicInbox::LeiSavedSearch;
+use PublicInbox::LeiSavedSearch; # OverIdx
 use PublicInbox::DS;
 use PublicInbox::PktOp;
 use PublicInbox::LeiFinmsg;
@@ -32,8 +32,10 @@ sub up1 ($$) {
        my $rawstr = $lss->{-cfg}->{'lei.internal.rawstr'} //
                (scalar(@$q) == 1 && substr($q->[0], -1) eq "\n");
        if ($rawstr) {
-               scalar(@$q) > 1 and
-                       die "$f: lei.q has multiple values (@$q) (out=$out)\n";
+               die <<EOM if scalar(@$q) > 1;
+$f: lei.q has multiple values (@$q) (out=$out)
+$f: while lei.internal.rawstr is set
+EOM
                $lse->query_approxidate($lse->git, $mset_opt->{qstr} = $q->[0]);
        } else {
                $mset_opt->{qstr} = $lse->query_argv_to_string($lse->git, $q);
@@ -75,6 +77,7 @@ sub redispatch_all ($$) {
        my $upq = [ (@{$self->{o_local} // []}, @{$self->{o_remote} // []}) ];
        return up1($lei, $upq->[0]) if @$upq == 1; # just one, may start MUA
 
+       PublicInbox::OverIdx::fork_ok($lei->{opt});
        # FIXME: this is also used per-query, see lei->_start_query
        my $j = $lei->{opt}->{jobs} || do {
                my $n = $self->detect_nproc // 1;
@@ -162,9 +165,8 @@ sub _complete_up { # lei__complete hook
        map { $match_cb->($_) } PublicInbox::LeiSavedSearch::list($lei);
 }
 
-sub _wq_done_wait { # dwaitpid callback
-       my ($arg, $pid) = @_;
-       my ($wq, $lei) = @$arg;
+sub _wq_done_wait { # awaitpid cb
+       my ($pid, $wq, $lei) = @_;
        $lei->child_error($?, 'auth failure') if $?
 }