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).

diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index adb356c975e4472dd239570336382f7bbda7a6e6..68c3c4598da30b3d4c0161edb053e13a59201866 100644 (file)
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -7,7 +7,6 @@ use v5.12;
 use PublicInbox::DS;
 use PublicInbox::Spawn qw(which popen_rd);
 use PublicInbox::InboxWritable qw(eml_from_path);
-use PublicInbox::AutoReap;
 
 # JMAP RFC 8621 4.1.1
 # https://www.iana.org/assignments/imap-jmap-keywords/imap-jmap-keywords.xhtml
@@ -114,15 +113,13 @@ sub handle_http_input ($$@) {
        push @$curl, '-s', @$curl_opt;
        my $cmd = $curl->for_uri($lei, $uri);
        $lei->qerr("# $cmd");
-       my ($fh, $pid) = popen_rd($cmd, undef, { 2 => $lei->{2} });
-       my $ar = PublicInbox::AutoReap->new($pid);
+       my $fh = popen_rd($cmd, undef, { 2 => $lei->{2} });
        grep(/\A--compressed\z/, @$curl) or
-               $fh = IO::Uncompress::Gunzip->new($fh, MultiStream => 1);
+               $fh = IO::Uncompress::Gunzip->new($fh,
+                                       MultiStream => 1, AutoClose => 1);
        eval { $self->input_fh('mboxrd', $fh, $url, @args) };
-       my @err = ($@ ? $@ : ());
-       $ar->join;
-       push(@err, "\$?=$?") if $?;
-       $lei->child_error($?, "@$cmd failed: @err") if @err;
+       my $err = $@ ? ": $@" : '';
+       $lei->child_error($?, "@$cmd failed$err") if $err || $?;
 }
 
 sub oid2eml { # git->cat_async cb

diff --git a/lib/PublicInbox/LeiRemote.pm b/lib/PublicInbox/LeiRemote.pm
index 54750062fd5f18c0c680c672f6eb544d04a77c95..559fb8d51e409a8a0e6386b6021dc024a24a4f55 100644 (file)
--- a/lib/PublicInbox/LeiRemote.pm
+++ b/lib/PublicInbox/LeiRemote.pm
@@ -12,7 +12,6 @@ use IO::Uncompress::Gunzip;
 use PublicInbox::MboxReader;
 use PublicInbox::Spawn qw(popen_rd);
 use PublicInbox::LeiCurl;
-use PublicInbox::AutoReap;
 use PublicInbox::ContentHash qw(git_sha);
 
 sub new {
@@ -22,7 +21,7 @@ sub new {
 
 sub isrch { $_[0] } # SolverGit expcets this
 
-sub _each_mboxrd_eml { # callback for MboxReader->mboxrd
+sub each_mboxrd_eml { # callback for MboxReader->mboxrd
        my ($eml, $self) = @_;
        my $lei = $self->{lei};
        my $xoids = $lei->{ale}->xoids_for($eml, 1);
@@ -47,14 +46,13 @@ sub mset {
        $uri->query_form(q => $qstr, x => 'm', r => 1); # r=1: relevance
        my $cmd = $curl->for_uri($self->{lei}, $uri);
        $self->{lei}->qerr("# $cmd");
-       my ($fh, $pid) = popen_rd($cmd, undef, { 2 => $lei->{2} });
-       my $ar = PublicInbox::AutoReap->new($pid);
        $self->{smsg} = [];
-       $fh = IO::Uncompress::Gunzip->new($fh, MultiStream => 1);
-       PublicInbox::MboxReader->mboxrd($fh, \&_each_mboxrd_eml, $self);
+       my $fh = popen_rd($cmd, undef, { 2 => $lei->{2} });
+       $fh = IO::Uncompress::Gunzip->new($fh, MultiStream=>1, AutoClose=>1);
+       eval { PublicInbox::MboxReader->mboxrd($fh, \&each_mboxrd_eml, $self) };
+       my $err = $@ ? ": $@" : '';
        my $wait = $self->{lei}->{sto}->wq_do('done');
-       $ar->join;
-       $lei->child_error($?) if $?;
+       $lei->child_error($?, "@$cmd failed$err") if $err || $?;
        $self; # we are the mset (and $ibx, and $self)
 }
 

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index ba8ff293e5912fa33828336d2bcf047c6745bea3..b09c246261c88838be7803789b7823cdfaebdffd 100644 (file)
--- 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);