X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FQspawn.pm;h=7984e35a80510ffdf09cbb7f5e325ecd9eb764a0;hb=a12cd80b5821cf5cb2c8672aad0fba94c451f728;hp=a1ff65b65324e177f9e5adad67dec703183434a7;hpb=96b0a14be7e62742ad06f0a37c3cba61fe6c51e7;p=public-inbox.git
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index a1ff65b6..7984e35a 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# Like most Perl modules in public-inbox, this is internal and
@@ -26,6 +26,7 @@
package PublicInbox::Qspawn;
use strict;
+use v5.10.1;
use PublicInbox::Spawn qw(popen_rd);
use PublicInbox::GzipFilter;
@@ -38,7 +39,8 @@ my $def_limiter;
# $cmd is the command to spawn
# $cmd_env is the environ for the child process (not PSGI env)
# $opt can include redirects and perhaps other process spawning options
-sub new ($$$;) {
+# {qsp_err} is an optional error buffer callers may access themselves
+sub new {
my ($class, $cmd, $cmd_env, $opt) = @_;
bless { args => [ $cmd, $cmd_env, $opt ] }, $class;
}
@@ -93,21 +95,23 @@ sub finalize ($$) {
}
if ($err) {
- if (defined $self->{err}) {
- $self->{err} .= "; $err";
- } else {
- $self->{err} = $err;
- }
- if ($env && $self->{cmd}) {
- warn join(' ', @{$self->{cmd}}) . ": $err";
+ utf8::decode($err);
+ if (my $dst = $self->{qsp_err}) {
+ $$dst .= $$dst ? " $err" : "; $err";
}
+ warn "@{$self->{cmd}}: $err" if $self->{cmd};
}
if ($qx_cb) {
eval { $qx_cb->($qx_buf, $qx_arg) };
- } elsif (my $wcb = delete $env->{'qspawn.wcb'}) {
+ 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));
}
}
@@ -130,9 +134,9 @@ sub start ($$$) {
}
}
-sub psgi_qx_init_cb {
+sub psgi_qx_init_cb { # this may be PublicInbox::HTTPD::Async {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:
@@ -185,14 +189,13 @@ sub event_step {
my ($self, $err) = @_; # $err: $!
warn "psgi_{return,qx} $err" if defined($err);
finish($self);
- my ($fh, $qx_fh) = delete(@$self{qw(fh qx_fh)});
+ my ($fh, $qx_fh) = delete(@$self{qw(qfh qx_fh)});
$fh->close if $fh; # async-only (psgi_return)
}
sub rd_hdr ($) {
my ($self) = @_;
# typically used for reading CGI headers
- # we must loop until EAGAIN for EPOLLET in HTTPD/Async.pm
# We also need to check EINTR for generic PSGI servers.
my $ret;
my $total_rd = 0;
@@ -220,45 +223,56 @@ sub rd_hdr ($) {
$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'} //
- PublicInbox::GzipFilter::qsp_maybe($r->[1], $env);
+ my $filter;
+ if (ref($r) eq 'ARRAY' && Scalar::Util::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'};
- my $async = delete $self->{async};
- if (scalar(@$r) == 3) { # error
- if ($async) {
- # calls rpipe->close && ->event_step
- $async->close;
- } else {
- $self->{rpipe}->close;
+ my $async = delete $self->{async}; # PublicInbox::HTTPD::Async
+ if (ref($r) ne 'ARRAY' || scalar(@$r) == 3) { # error
+ if ($async) { # calls rpipe->close && ->event_step
+ $async->close; # PublicInbox::HTTPD::Async::close
+ } else { # generic PSGI:
+ delete($self->{rpipe})->close;
event_step($self);
+ waitpid_err($self);
}
- $wcb->($r);
+ if (ref($r) eq 'ARRAY') { # error
+ $wcb->($r)
+ } elsif (ref($r) eq 'CODE') { # chain another command
+ $r->($wcb);
+ $self->{passed} = 1;
+ }
+ # else do nothing
} elsif ($async) {
# done reading headers, handoff to read body
my $fh = $wcb->($r); # scalar @$r == 2
$fh = $filter->attach($fh) if $filter;
- $self->{fh} = $fh;
+ $self->{qfh} = $fh;
$async->async_pass($env->{'psgix.io'}, $fh,
delete($self->{hdr_buf}));
} else { # for synchronous PSGI servers
require PublicInbox::GetlineBody;
+ my $buf = delete $self->{hdr_buf};
$r->[2] = PublicInbox::GetlineBody->new($self->{rpipe},
- \&event_step, $self,
- ${$self->{hdr_buf}}, $filter);
+ \&event_step, $self, $$buf, $filter);
$wcb->($r);
}
}
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};