From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/4] qspawn: psgi_qx: do not call async_pass on errors
Date: Thu, 19 Jan 2023 20:32:35 +0000 [thread overview]
Message-ID: <20230119203237.2277543-3-e@80x24.org> (raw)
In-Reply-To: <20230119203237.2277543-1-e@80x24.org>
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);
}
}
next prev parent reply other threads:[~2023-01-19 20:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 20:32 [PATCH 0/4] qspawn|awaitpid error handling improvements Eric Wong
2023-01-19 20:32 ` [PATCH 1/4] qspawn: {quiet} only affects normal command exit Eric Wong
2023-01-19 20:32 ` Eric Wong [this message]
2023-01-19 20:32 ` [PATCH 3/4] ds: improve error handling of synchronous awaitpid Eric Wong
2023-01-19 20:32 ` [PATCH 4/4] qspawn: drop unnecessary awaitpid import Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230119203237.2277543-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).