]> git.ipfire.org Git - thirdparty/public-inbox.git/commitdiff
lei_to_mail: improve SIGPIPE handling
authorEric Wong <e@80x24.org>
Tue, 30 Jan 2024 10:20:49 +0000 (10:20 +0000)
committerEric Wong <e@80x24.org>
Wed, 31 Jan 2024 02:11:44 +0000 (02:11 +0000)
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.

lib/PublicInbox/LeiToMail.pm

index 008da52ef597dec210a5ddb3b4aa39b5d9ff5563..9197bb441a73ced58446ba912cd1ead00bf9aa0a 100644 (file)
@@ -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))) {