# processes such as git-apply(1).
package PublicInbox::Qspawn;
-use strict;
-use v5.10.1;
+use v5.12;
use PublicInbox::Spawn qw(popen_rd);
use PublicInbox::GzipFilter;
+use Scalar::Util qw(blessed);
# n.b.: we get EAGAIN with public-inbox-httpd, and EINTR on other PSGI servers
use Errno qw(EAGAIN EINTR);
# $cmd_env is the environ for the child process (not PSGI env)
# $opt can include redirects and perhaps other process spawning options
# {qsp_err} is an optional error buffer callers may access themselves
-sub new ($$$;) {
+sub new {
my ($class, $cmd, $cmd_env, $opt) = @_;
bless { args => [ $cmd, $cmd_env, $opt ] }, $class;
}
return unless $@;
warn "E: $@"; # hope qspawn.wcb can handle it
}
+ return if $self->{passed}; # another command chained it
if (my $wcb = delete $env->{'qspawn.wcb'}) {
# have we started writing, yet?
+ my $code = delete $env->{'qspawn.fallback'} // 500;
require PublicInbox::WwwStatic;
- $wcb->(PublicInbox::WwwStatic::r(500));
+ $wcb->(PublicInbox::WwwStatic::r($code));
}
}
}
}
-sub psgi_qx_init_cb {
+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 $total_rd = 0;
my $hdr_buf = $self->{hdr_buf};
my ($ph_cb, $ph_arg) = @{$self->{parse_hdr}};
- do {
+ until (defined($ret)) {
my $r = sysread($self->{rpipe}, $$hdr_buf, 4096,
length($$hdr_buf));
if (defined($r)) {
if ($@) {
warn "parse_hdr: $@";
$ret = [ 500, [], [ "Internal error\n" ] ];
+ } elsif (!defined($ret) && !$r) {
+ my $cmd = $self->{cmd} // [ '(?)' ];
+ my $env = $self->{psgi_env};
+ warn <<EOM;
+EOF parsing headers from @$cmd ($self->{psgi_env}->{REQUEST_URI})
+EOM
+ $ret = [ 500, [], [ "Internal error\n" ] ];
}
} else {
# caller should notify us when it's ready:
warn "error reading header: $!";
$ret = [ 500, [], [ "Internal error\n" ] ];
}
- } until (defined $ret);
+ }
delete $self->{parse_hdr}; # done parsing headers
$ret;
}
-sub psgi_return_init_cb {
+sub psgi_return_init_cb { # this may be PublicInbox::HTTPD::Async {cb}
my ($self) = @_;
my $r = rd_hdr($self) or return;
my $env = $self->{psgi_env};
- my $filter = delete($env->{'qspawn.filter'}) // (ref($r) eq 'ARRAY' ?
+ my $filter;
+
+ # this is for RepoAtom since that can fire after parse_cgi_headers
+ if (ref($r) eq 'ARRAY' && blessed($r->[2]) && $r->[2]->can('attach')) {
+ $filter = pop @$r;
+ }
+ $filter //= delete($env->{'qspawn.filter'}) // (ref($r) eq 'ARRAY' ?
PublicInbox::GzipFilter::qsp_maybe($r->[1], $env) : undef);
my $wcb = delete $env->{'qspawn.wcb'};
if (ref($r) ne 'ARRAY' || scalar(@$r) == 3) { # error
if ($async) { # calls rpipe->close && ->event_step
$async->close; # PublicInbox::HTTPD::Async::close
- } else {
- $self->{rpipe}->close;
+ } else { # generic PSGI:
+ delete($self->{rpipe})->close;
event_step($self);
+ waitpid_err($self);
}
if (ref($r) eq 'ARRAY') { # error
$wcb->($r)
} elsif (ref($r) eq 'CODE') { # chain another command
- $r->($wcb)
+ $r->($wcb);
+ $self->{passed} = 1;
}
# else do nothing
} elsif ($async) {
}
package PublicInbox::Qspawn::Limiter;
-use strict;
-use warnings;
+use v5.12;
sub new {
my ($class, $max) = @_;