From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 17/18] qspawn: use WwwStatic for fallbacks and error code
Date: Mon, 23 Oct 2023 08:48:36 +0000 [thread overview]
Message-ID: <20231023084837.2804687-17-e@80x24.org> (raw)
In-Reply-To: <20231023084837.2804687-1-e@80x24.org>
This ensures we set directives to disable caching since
errors are always transient.
---
lib/PublicInbox/Qspawn.pm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index a6e1d58b..0bb02081 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -74,6 +74,11 @@ sub _do_spawn {
finish($self, $@) if $@;
}
+sub psgi_status_err { # Qspawn itself is useful w/o PSGI
+ require PublicInbox::WwwStatic;
+ PublicInbox::WwwStatic::r($_[0] // 500);
+}
+
sub finalize ($;$) {
my ($self, $opt) = @_;
@@ -104,9 +109,7 @@ sub finalize ($;$) {
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($code));
+ $wcb->(psgi_status_err($env->{'qspawn.fallback'}));
}
}
@@ -209,8 +212,6 @@ sub yield_pass {
$self->{qfh} = $qfh; # keep $ipipe open
}
-sub r500 () { [ 500, [], [ "Internal error\n" ] ] }
-
sub parse_hdr_done ($$) {
my ($self) = @_;
my $ret;
@@ -220,18 +221,18 @@ sub parse_hdr_done ($$) {
$ret = eval { $ph_cb->(length($_[-1]), $bref, @ph_arg) };
if ($@) {
carp "parse_hdr (@{$self->{cmd}}): $@\n";
- $ret = r500();
+ $ret = psgi_status_err();
} elsif (!$ret && $_[-1] eq '') {
carp <<EOM;
EOF parsing headers from @{$self->{cmd}} ($self->{psgi_env}->{REQUEST_URI})
EOM
- $ret = r500();
+ $ret = psgi_status_err();
}
} else {
carp <<EOM;
E: parsing headers: $! from @{$self->{cmd}} ($self->{psgi_env}->{REQUEST_URI})
EOM
- $ret = r500();
+ $ret = psgi_status_err();
}
$ret; # undef if headers incomplete
}
next prev parent reply other threads:[~2023-10-23 8:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 8:48 [PATCH 01/18] limiter: split out from qspawn Eric Wong
2023-10-23 8:48 ` [PATCH 02/18] spawn: support synchronous run_qx Eric Wong
2023-10-23 8:48 ` [PATCH 03/18] psgi_qx: use a temporary file rather than pipe Eric Wong
2023-10-23 8:48 ` [PATCH 04/18] www_coderepo: capture uses a flattened list Eric Wong
2023-10-23 8:48 ` [PATCH 05/18] qspawn: psgi_return allows list for callback args Eric Wong
2023-10-23 8:48 ` [PATCH 06/18] qspawn: drop unused err arg for ->event_step Eric Wong
2023-10-23 8:48 ` [PATCH 07/18] httpd/async: require IO arg Eric Wong
2023-10-23 8:48 ` [PATCH 08/18] xt/check-run: call DS->Reset after all tests Eric Wong
2023-10-23 8:48 ` [PATCH 09/18] qspawn: introduce new psgi_yield API Eric Wong
2023-10-23 8:48 ` [PATCH 10/18] repo_atom: switch to psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 11/18] repo_snapshot: psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 12/18] viewvcs: psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 13/18] www_altid: switch to psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 14/18] cgit: " Eric Wong
2023-10-23 8:48 ` [PATCH 15/18] www_coderepo: psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 16/18] drop psgi_return, httpd/async and GetlineBody Eric Wong
2023-10-23 8:48 ` Eric Wong [this message]
2023-10-23 8:48 ` [PATCH 18/18] qspawn: simplify argument passing 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231023084837.2804687-17-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.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.
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).