From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 2/4] wwwstatic: offload error handling to PSGI server
Date: Fri, 24 Jan 2020 09:43:50 +0000 [thread overview]
Message-ID: <20200124094352.19437-3-e@yhbt.net> (raw)
In-Reply-To: <20200124094352.19437-1-e@yhbt.net>
The PSGI server needs to account for ->getline failing
due to disk failures or truncated files, anyways. So
just die() ourselves and let the PSGI server log and
drop the client.
---
lib/PublicInbox/WwwStatic.pm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/PublicInbox/WwwStatic.pm b/lib/PublicInbox/WwwStatic.pm
index 917049bb..e1f536f3 100644
--- a/lib/PublicInbox/WwwStatic.pm
+++ b/lib/PublicInbox/WwwStatic.pm
@@ -169,16 +169,7 @@ sub getline {
return $buf;
}
my $m = defined $r ? "EOF with $len bytes left" : "read error: $!";
- my $env = $self->{env};
- $env->{'psgi.errors'}->print("$self->{path} $m\n");
-
- # drop the client on error
- if (my $io = $env->{'psgix.io'}) {
- $io->close; # this is likely PublicInbox::DS::close
- } else { # for some PSGI servers w/o psgix.io
- die "dropping client socket\n";
- }
- undef;
+ die "$self->{path} $m, dropping client socket\n";
}
sub close {} # noop, called by PSGI server, just let everything go out-of-scope
next prev parent reply other threads:[~2020-01-24 9:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 9:43 [PATCH 0/4] -httpd static file improvements Eric Wong
2020-01-24 9:43 ` [PATCH 1/4] http: eliminate short-lived cyclic ref for psgix.io Eric Wong
2020-01-24 9:43 ` Eric Wong [this message]
2020-01-24 9:43 ` [PATCH 3/4] ds: tmpio: store offsets per-buffer Eric Wong
2020-01-24 19:07 ` Eric Wong
2020-01-24 9:43 ` [PATCH 4/4] wwwstatic: wire up buffer bypass for -httpd Eric Wong
2020-01-25 19:27 ` Eric Wong
2020-01-25 19:34 ` 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=20200124094352.19437-3-e@yhbt.net \
--to=e@yhbt.net \
--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.
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).