user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 2/2] nntp: correctly log long response errors
Date: Wed,  8 Jan 2020 10:44:09 +0000
Message-ID: <20200108104409.8885-3-e@yhbt.net> (raw)
In-Reply-To: <20200108104409.8885-1-e@yhbt.net>

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;
 }

      parent reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-08 10:44 [PATCH 0/2] nntpd and daemon bugfixes Eric Wong
2020-01-08 10:44 ` [PATCH 1/2] daemon: ignore SIGPIPE while running Eric Wong
2020-01-08 10:44 ` Eric Wong [this message]

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: http://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=20200108104409.8885-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

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git