* [PATCH] lei_to_mail: don't close STDOUT unless it is a mbox* output
@ 2023-11-22 0:13 7% Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2023-11-22 0:13 UTC (permalink / raw)
To: meta
We only care about error checking when stdout is an mbox output
pointed to a pathname. This is noticeable with `lei up' with
multiple non-mbox* destinations. We'll also ensure throwing
exceptions to trigger lei->x_it from lei->do_env results in the
epoll/kqueue watch being discarded, otherwise commands may never
terminate (leading to stuck tests)
---
lib/PublicInbox/LEI.pm | 1 +
lib/PublicInbox/LeiToMail.pm | 4 ++--
t/lei-q-save.t | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 8d235b37..86b71fcd 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -493,6 +493,7 @@ sub x_it ($$) {
} elsif ($quit == \&CORE::exit) { # an admin (one-shot) command
exit($code >> 8);
} # else ignore if client disconnected
+ $self->dclose if $$ == $daemon_pid;
}
sub err ($;@) {
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 007191bb..a930fc30 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -612,8 +612,8 @@ sub _pre_augment_mbox {
sub finish_output {
my ($self, $lei) = @_;
my $out = delete $lei->{1} // die 'BUG: no lei->{1}';
- my $old = delete $lei->{old_1};
- $lei->{1} = $old if $old;
+ my $old = delete $lei->{old_1} or return; # path only
+ $lei->{1} = $old;
return if $out->close; # reaps gzip|pigz|xz|bzip2
my $msg = "E: Error closing $lei->{ovv}->{dst}";
$? ? $lei->child_error($?) : ($msg .= " ($!)");
diff --git a/t/lei-q-save.t b/t/lei-q-save.t
index a9f9d4d6..0970bc3c 100644
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -305,5 +305,7 @@ EOM
is(scalar(@new), 2, 'got new message');
is_xdeeply([grep { $_ eq $orig[0] } @new], \@orig,
'original message preserved on up w/ threads');
+ lei_ok 'up', "$home/md", $d, \'multiple maildir up';
+ unlike $lei_err, qr! line \d+!s, 'no warnings';
});
done_testing;
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-11-22 0:13 7% [PATCH] lei_to_mail: don't close STDOUT unless it is a mbox* output Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).