* [PATCH 0/2] nntpd and daemon bugfixes
@ 2020-01-08 10:44 Eric Wong
2020-01-08 10:44 ` [PATCH 1/2] daemon: ignore SIGPIPE while running Eric Wong
2020-01-08 10:44 ` [PATCH 2/2] nntp: correctly log long response errors Eric Wong
0 siblings, 2 replies; 3+ messages in thread
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 [flat|nested] 3+ messages in thread
* [PATCH 1/2] daemon: ignore SIGPIPE while running
2020-01-08 10:44 [PATCH 0/2] nntpd and daemon bugfixes Eric Wong
@ 2020-01-08 10:44 ` Eric Wong
2020-01-08 10:44 ` [PATCH 2/2] nntp: correctly log long response errors Eric Wong
1 sibling, 0 replies; 3+ messages in thread
From: Eric Wong @ 2020-01-08 10:44 UTC (permalink / raw)
To: meta
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();
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] nntp: correctly log long response errors
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
1 sibling, 0 replies; 3+ messages in thread
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 [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-08 10:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [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).