[PATCH 0/2] nntpd and daemon bugfixes

[PATCH 0/2] nntpd and daemon bugfixes

[Eric Wong]

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(-)

[PATCH 1/2] daemon: ignore SIGPIPE while running

[Eric Wong]

This is only needed for IO::Poll users, since users with
(signalfd || EVFILT_SIGNAL) support run with SIGPIPE (and
all other signals) blocked.

Fixes: 81a9a43fb858d197 ("daemon: use sigprocmask to block signals at startup")
---
 lib/PublicInbox/Daemon.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 292bc339..278c80f5 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -637,6 +637,7 @@ sub daemon_loop ($$$$) {
 
 sub run ($$$;$) {
 	my ($default, $refresh, $post_accept, $nntpd) = @_;
+	local $SIG{PIPE} = 'IGNORE';
 	daemon_prepare($default);
 	my $af_default = $default =~ /:8080\z/ ? 'httpready' : undef;
 	my $for_destroy = daemonize();

[PATCH 2/2] nntp: correctly log long response errors

[Eric Wong]

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