This makes things easier-to-follow in a minimally-typed language. --- lib/PublicInbox/LeiBlob.pm | 4 ++-- lib/PublicInbox/Qspawn.pm | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm index 004b156c..1692289c 100644 --- a/lib/PublicInbox/LeiBlob.pm +++ b/lib/PublicInbox/LeiBlob.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2021 all contributors <[email protected]> +# Copyright (C) all contributors <[email protected]> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> # "lei blob $OID" command @@ -70,7 +70,7 @@ sub do_solve_blob { # via wq_do } @$git_dirs ], user_cb => \&solver_user_cb, uarg => $self, - # -cur_di, -qsp, -msg => temporary fields for Qspawn callbacks + # -cur_di, -msg => temporary fields for Qspawn callbacks inboxes => [ $self->{lxs}->locals, @rmt ], }, 'PublicInbox::SolverGit'; local $PublicInbox::DS::in_loop = 0; # waitpid synchronously diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index 53d0ad55..79db9e76 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -132,7 +132,7 @@ sub start ($$$) { sub psgi_qx_init_cb { my ($self) = @_; - my $async = delete $self->{async}; + my $async = delete $self->{async}; # PublicInbox::HTTPD::Async my ($r, $buf); my $qx_fh = $self->{qx_fh}; reread: @@ -227,11 +227,10 @@ sub psgi_return_init_cb { PublicInbox::GzipFilter::qsp_maybe($r->[1], $env); my $wcb = delete $env->{'qspawn.wcb'}; - my $async = delete $self->{async}; + my $async = delete $self->{async}; # PublicInbox::HTTPD::Async if (scalar(@$r) == 3) { # error - if ($async) { - # calls rpipe->close && ->event_step - $async->close; + if ($async) { # calls rpipe->close && ->event_step + $async->close; # PublicInbox::HTTPD::Async::close } else { $self->{rpipe}->close; event_step($self); @@ -255,9 +254,9 @@ sub psgi_return_init_cb { sub psgi_return_start { # may run later, much later... my ($self) = @_; - if (my $async = $self->{psgi_env}->{'pi-httpd.async'}) { + if (my $cb = $self->{psgi_env}->{'pi-httpd.async'}) { # PublicInbox::HTTPD::Async->new(rpipe, $cb, $cb_arg, $end_obj) - $self->{async} = $async->($self->{rpipe}, + $self->{async} = $cb->($self->{rpipe}, \&psgi_return_init_cb, $self, $self); } else { # generic PSGI psgi_return_init_cb($self) while $self->{parse_hdr};
