From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id AFCD61F884 for ; Wed, 8 Jan 2020 10:44:09 +0000 (UTC) From: Eric Wong 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> In-Reply-To: <20200108104409.8885-1-e@yhbt.net> References: <20200108104409.8885-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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; }