No ext_urls

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

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 02357dbf83988fb4db2c2223a9f0a58dca17187f..5e4fd5cb8541a2a8202d188ae1fd73c88fe64188 100644 (file)
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -28,7 +28,6 @@ package PublicInbox::Qspawn;
 use v5.12;
 use PublicInbox::Spawn qw(popen_rd);
 use PublicInbox::GzipFilter;
-use PublicInbox::DS qw(awaitpid);
 use Scalar::Util qw(blessed);
 
 # n.b.: we get EAGAIN with public-inbox-httpd, and EINTR on other PSGI servers
@@ -57,7 +56,8 @@ sub _do_spawn {
                        $o{$k} = $rlimit;
                }
        }
-       $self->{cmd} = $o{quiet} ? undef : $cmd;
+       $self->{cmd} = $cmd;
+       $self->{-quiet} = 1 if $o{quiet};
        $o{cb_arg} = [ \&waitpid_err, $self ];
        eval {
                # popen_rd may die on EMFILE, ENFILE
@@ -85,7 +85,7 @@ sub finalize ($) {
                if (my $dst = $self->{qsp_err}) {
                        $$dst .= $$dst ? " $err" : "; $err";
                }
-               warn "@{$self->{cmd}}: $err" if $self->{cmd};
+               warn "@{$self->{cmd}}: $err\n" if !$self->{-quiet};
        }
 
        my ($env, $qx_cb, $qx_arg, $qx_buf) =
@@ -104,6 +104,8 @@ sub finalize ($) {
        }
 }
 
+sub DESTROY { finalize($_[0]) } # ->finalize is idempotent
+
 sub waitpid_err { # callback for awaitpid
        my (undef, $self) = @_; # $_[0]: pid
        $self->{_err} = ''; # for defined check in ->finish
@@ -139,20 +141,20 @@ sub start ($$$) {
 
 sub psgi_qx_init_cb { # this may be PublicInbox::HTTPD::Async {cb}
        my ($self) = @_;
-       my $async = delete $self->{async}; # PublicInbox::HTTPD::Async
        my ($r, $buf);
-       my $qx_fh = $self->{qx_fh};
 reread:
        $r = sysread($self->{rpipe}, $buf, 65536);
-       if ($async) {
-               $async->async_pass($self->{psgi_env}->{'psgix.io'},
-                                       $qx_fh, \$buf);
-       } elsif (defined $r) {
-               $r ? (print $qx_fh $buf) : event_step($self, undef);
-       } else {
+       if (!defined($r)) {
                return if $! == EAGAIN; # try again when notified
                goto reread if $! == EINTR;
                event_step($self, $!);
+       } elsif (my $as = delete $self->{async}) { # PublicInbox::HTTPD::Async
+               $as->async_pass($self->{psgi_env}->{'psgix.io'},
+                               $self->{qx_fh}, \$buf);
+       } elsif ($r) { # generic PSGI:
+               print { $self->{qx_fh} } $buf;
+       } else { # EOF
+               event_step($self, undef);
        }
 }
 
@@ -214,9 +216,8 @@ sub rd_hdr ($) {
                                warn "parse_hdr: $@";
                                $ret = [ 500, [], [ "Internal error\n" ] ];
                        } elsif (!defined($ret) && !$r) {
-                               my $cmd = $self->{cmd} // [ '(?)' ];
                                warn <<EOM;
-EOF parsing headers from @$cmd ($self->{psgi_env}->{REQUEST_URI})
+EOF parsing headers from @{$self->{cmd}} ($self->{psgi_env}->{REQUEST_URI})
 EOM
                                $ret = [ 500, [], [ "Internal error\n" ] ];
                        }