From e15a6fb8ba95295d3e9a5c38054b96f18b038781 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 9 Nov 2023 10:09:45 +0000 Subject: lei: get rid of autoreap usage We can rely on Process::IO->DESTROY to close and reap in these cases. This is the final step in eliminating the wantarray invocations of popen_rd (and popen_wr). --- lib/PublicInbox/LeiXSearch.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lib/PublicInbox/LeiXSearch.pm') diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index ba8ff293..b09c2462 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -346,14 +346,17 @@ print STDERR $_; my $cmd = $curl->for_uri($lei, $uri); $lei->qerr("# $cmd"); $rdr->{2} //= popen_wr(@lbf_tee) if @lbf_tee; - my $cfh = popen_rd($cmd, undef, $rdr); - my $fh = IO::Uncompress::Gunzip->new($cfh, MultiStream => 1); - PublicInbox::MboxReader->mboxrd($fh, \&each_remote_eml, $self, - $lei, $each_smsg); + my $fh = popen_rd($cmd, undef, $rdr); + $fh = IO::Uncompress::Gunzip->new($fh, + MultiStream => 1, AutoClose => 1); + eval { + PublicInbox::MboxReader->mboxrd($fh, \&each_remote_eml, + $self, $lei, $each_smsg); + }; + my ($exc, $code) = ($@, $?); $lei->sto_done_request if delete($self->{-sto_imported}); + die "E: $exc" if $exc && !$code; my $nr = delete $lei->{-nr_remote_eml} // 0; - $cfh->close; - my $code = $?; if (!$code) { # don't update if no results, maybe MTA is down $lei->{lss}->cfg_set($key, $start) if $key && $nr; mset_progress($lei, $lei->{-current_url}, $nr, $nr); -- cgit v1.2.3-24-ge0c7