lei + ipc: simplify process reaping

[public-inbox.git] / lib / PublicInbox / LeiBlob.pm

diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm
index 0921796428b4254af4f07ed00a85ecd179a28652..004b156c3396acde3e419bbe723e7cd144ebcf4d 100644 (file)
--- a/lib/PublicInbox/LeiBlob.pm
+++ b/lib/PublicInbox/LeiBlob.pm
@@ -32,7 +32,7 @@ sub solver_user_cb { # called by solver when done
        my $lei = $self->{lei};
        my $log_buf = delete $lei->{'log_buf'};
        $$log_buf =~ s/^/# /sgm;
-       ref($res) eq 'ARRAY' or return $lei->child_error(1 << 8, $$log_buf);
+       ref($res) eq 'ARRAY' or return $lei->child_error(0, $$log_buf);
        $lei->qerr($$log_buf);
        my ($git, $oid, $type, $size, $di) = @$res;
        my $gd = $git->{git_dir};
@@ -40,7 +40,7 @@ sub solver_user_cb { # called by solver when done
        # don't try to support all the git-show(1) options for non-blob,
        # this is just a convenience:
        $type ne 'blob' and
-               $lei->err("# $oid is a $type of $size bytes in:\n#\t$gd");
+               warn "# $oid is a $type of $size bytes in:\n#\t$gd\n";
 
        my $cmd = [ 'git', "--git-dir=$gd", 'show', $oid ];
        my $rdr = { 1 => $lei->{1}, 2 => $lei->{2} };
@@ -73,7 +73,6 @@ sub do_solve_blob { # via wq_do
                # -cur_di, -qsp, -msg => temporary fields for Qspawn callbacks
                inboxes => [ $self->{lxs}->locals, @rmt ],
        }, 'PublicInbox::SolverGit';
-       $lei->{env}->{'psgi.errors'} = $lei->{2}; # ugh...
        local $PublicInbox::DS::in_loop = 0; # waitpid synchronously
        $solver->solve($lei->{env}, $log, $self->{oid_b}, $hints);
 }
@@ -112,7 +111,7 @@ sub lei_blob {
        if ($opt->{mail} // ($has_hints ? 0 : 1)) {
                if (grep(defined, @$opt{qw(include only)})) {
                        $lxs = $lei->lxs_prepare;
-                       $lei->ale->refresh_externals($lxs);
+                       $lei->ale->refresh_externals($lxs, $lei);
                }
                my $rdr = {};
                if ($opt->{mail}) {
@@ -133,8 +132,7 @@ sub lei_blob {
                }
                my $ce = $?;
                return if $ce == 0;
-               my $sto = $lei->_lei_store;
-               my $lms = $sto ? $sto->search->lms : undef;
+               my $lms = $lei->lms;
                if (my $bref = $lms ? $lms->local_blob($blob, 1) : undef) {
                        defined($lei->{-attach_idx}) and
                                return extract_attach($lei, $blob, $bref);
@@ -155,7 +153,7 @@ sub lei_blob {
        return $lei->fail('no --git-dir to try') unless @$git_dirs;
        unless ($lxs) {
                $lxs = $lei->lxs_prepare or return;
-               $lei->ale->refresh_externals($lxs);
+               $lei->ale->refresh_externals($lxs, $lei);
        }
        if ($lxs->remotes) {
                require PublicInbox::LeiRemote;
@@ -168,7 +166,7 @@ sub lei_blob {
        my ($op_c, $ops) = $lei->workers_start($self, 1);
        $lei->{wq1} = $self;
        $self->wq_io_do('do_solve_blob', []);
-       $self->wq_close(1);
+       $self->wq_close;
        $lei->wait_wq_events($op_c, $ops);
 }