From 876ee62a686c66037427232541c0ca4ebebfff94 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 19 Jan 2023 20:32:35 +0000 Subject: qspawn: psgi_qx: do not call async_pass on errors This makes control flow slightly less confusing. --- lib/PublicInbox/Qspawn.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index c4708c0f..de74b174 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -142,20 +142,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); } } -- cgit v1.2.3-24-ge0c7