* [PATCH 2/2] nntp: correctly log long response errors
2020-01-08 10:44 5% [PATCH 0/2] nntpd and daemon bugfixes Eric Wong
@ 2020-01-08 10:44 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-08 10:44 UTC (permalink / raw)
To: meta
We cannot safely call "fileno(undef)" without bringing down the
entire -nntpd process :x. To ensure no logging regression, we
now stash the FD for the duration of the long response to ensure
the error can be matched to the original command in logs.
Fixes: 207b89615a1a0c06 ("nntp: remove cyclic refs from long_response")
---
lib/PublicInbox/NNTP.pm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 95c9082d..9f0dfaaa 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -596,12 +596,11 @@ sub get_range ($$) {
sub long_step {
my ($self) = @_;
# wbuf is unset or empty, here; {long} may add to it
- my ($cb, $t0, @args) = @{$self->{long_cb}};
+ my ($fd, $cb, $t0, @args) = @{$self->{long_cb}};
my $more = eval { $cb->($self, @args) };
if ($@ || !$self->{sock}) { # something bad happened...
delete $self->{long_cb};
my $elapsed = now() - $t0;
- my $fd = fileno($self->{sock});
if ($@) {
err($self,
"%s during long response[$fd] - %0.6f",
@@ -638,11 +637,11 @@ sub long_step {
sub long_response ($$;@) {
my ($self, $cb, @args) = @_; # cb returns true if more, false if done
- $self->{sock} or return;
+ my $sock = $self->{sock} or return;
# make sure we disable reading during a long response,
# clients should not be sending us stuff and making us do more
# work while we are stream a response to them
- $self->{long_cb} = [ $cb, now(), @args ];
+ $self->{long_cb} = [ fileno($sock), $cb, now(), @args ];
long_step($self); # kick off!
undef;
}
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] nntpd and daemon bugfixes
@ 2020-01-08 10:44 5% Eric Wong
2020-01-08 10:44 7% ` [PATCH 2/2] nntp: correctly log long response errors Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-08 10:44 UTC (permalink / raw)
To: meta
Eric Wong (2):
daemon: keep SIGPIPE ignored while running
nntp: correctly log long response errors
lib/PublicInbox/Daemon.pm | 1 +
lib/PublicInbox/NNTP.pm | 7 +++----
2 files changed, 4 insertions(+), 4 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-08 10:44 5% [PATCH 0/2] nntpd and daemon bugfixes Eric Wong
2020-01-08 10:44 7% ` [PATCH 2/2] nntp: correctly log long response errors Eric Wong
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).