lei: always pass $lei to LeiAuth->op_merge

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

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 4aa2a81c00256698b87241bfe7c19578210aad4e..acc36897d4e3f2c5864200516f2b19db14292ca4 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -142,11 +142,11 @@ sub wait_startq ($) {
                                delete $lei->{opt}->{verbose};
                                delete $lei->{-progress};
                        } else {
-                               $lei->fail("$$ WTF `$do_augment_done'");
+                               die "BUG: do_augment_done=`$do_augment_done'";
                        }
                        return;
                }
-               return $lei->fail("$$ wait_startq: $!") unless $!{EINTR};
+               die "wait_startq: $!" unless $!{EINTR};
        }
 }
 
@@ -460,10 +460,11 @@ sub do_post_augment {
        my ($lei) = @_;
        local $PublicInbox::LEI::current_lei = $lei;
        my $l2m = $lei->{l2m} or return; # client disconnected
-       $lei->fchdir or return;
-       my $err;
-       eval { $l2m->post_augment($lei) };
-       $err = $@;
+       eval {
+               $lei->fchdir;
+               $l2m->post_augment($lei);
+       };
+       my $err = $@;
        if ($err) {
                if (my $lxs = delete $lei->{lxs}) {
                        $lxs->wq_kill('-TERM');
@@ -472,7 +473,8 @@ sub do_post_augment {
                $lei->fail("$err");
        }
        if (!$err && delete $lei->{early_mua}) { # non-augment case
-               $lei->start_mua;
+               eval { $lei->start_mua };
+               $lei->fail($@) if $@;
        }
        close(delete $lei->{au_done}); # triggers wait_startq in lei_xsearch
 }
@@ -546,7 +548,7 @@ sub do_query {
                'child_error' => [ $lei ],
                'incr_start_query' => [ $self, $lei ],
        };
-       $lei->{auth}->op_merge($ops, $l2m) if $l2m && $lei->{auth};
+       $lei->{auth}->op_merge($ops, $l2m, $lei) if $l2m && $lei->{auth};
        my $end = $lei->pkt_op_pair;
        $lei->{1}->autoflush(1);
        $lei->start_pager if delete $lei->{need_pager};