about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2024-01-30 10:20:49 +0000
committerEric Wong <e@80x24.org>2024-01-31 02:11:44 +0000
commit82442ae358c8154f4ea05947d39a36cb05ff84bc (patch)
treeb1b4ed40278ca4b89655d9a40fbc7e25c767c499
parent53eafcd90a3179200192263807cf3df7c869b500 (diff)
downloadpublic-inbox-82442ae358c8154f4ea05947d39a36cb05ff84bc.tar.gz
I can't reproduce this in t/lei-sigpipe.t with GIANT_INBOX_DIR.
In real-world usage, having a large `lei q -f text ...' output
piped to a pager and killing the pager prematurely could
trigger:

	non-fatal error from PublicInbox::LeiToMail $?=256

messages in my terminal.  This is because $self->{lei} was
becoming undefined in the process cleanup process of
git_to_mail.  So flip the cleanup logic around and
unconditionally check for Git::cleanup state to bail out
early.

With this change, the `non-fatal error ...' message no longer
appears when I stop reading results early.
-rw-r--r--lib/PublicInbox/LeiToMail.pm8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 008da52e..9197bb44 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -136,11 +136,9 @@ sub eml2mboxcl2 {
 sub git_to_mail { # git->cat_async callback
         my ($bref, $oid, $type, $size, $smsg) = @_;
         $type // return; # called by PublicInbox::Git::close
-        my $self = delete $smsg->{l2m};
-        if (!defined($self)) {
-                return if $PublicInbox::Git::in_cleanup;
-                croak "BUG: no l2m (type=$type)";
-        }
+        return if $PublicInbox::Git::in_cleanup;
+        my $self = delete $smsg->{l2m} // croak "BUG: no l2m (type=$type)";
+        $self->{lei} // croak "BUG: no {lei} (type=$type)";
         eval {
                 if ($type eq 'missing' &&
                           ($bref = $self->{-lms_rw}->local_blob($oid, 1))) {