From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 7/7] nntpd: support SIGUSR2 in single-process mode, too
Date: Thu, 24 Sep 2015 03:37:21 +0000 [thread overview]
Message-ID: <20150924033721.26231-8-e@80x24.org> (raw)
In-Reply-To: <20150924033721.26231-1-e@80x24.org>
We may support SIGUSR2 in single-process mode as long
as permissions aren't wonky.
---
public-inbox-nntpd | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/public-inbox-nntpd b/public-inbox-nntpd
index 9fb69ce..67fc90b 100644
--- a/public-inbox-nntpd
+++ b/public-inbox-nntpd
@@ -99,6 +99,9 @@ if (defined $pid_file || defined $group || defined $user || $daemonize) {
if (defined $pid_file) {
my $unlink_pid = $$;
Net::Server::Daemonize::create_pid_file($pid_file);
+ if ($uid and !chown($uid, $gid, $pid_file)) {
+ warn "could not chown $pid_file: $!\n";
+ }
END { unlink_pid_file_safe_ish($unlink_pid, $pid_file) };
}
}
@@ -175,14 +178,15 @@ if ($worker_processes > 0) {
sysread($r, my $buf, 8);
}
} else {
+ $set_user->() if $set_user;
+ $SIG{USR2} = sub { worker_quit() if upgrade() };
worker:
# this calls epoll_create:
- @listeners = map { PublicInbox::Listener->new($_) } @listeners;
reopen_logs();
$SIG{QUIT} = $SIG{INT} = $SIG{TERM} = *worker_quit;
$SIG{USR1} = *reopen_logs;
$SIG{HUP} = $refresh;
- $_->watch_read(1) for @listeners;
+ PublicInbox::Listener->new($_) for @listeners;
Danga::Socket->EventLoop;
}
@@ -192,7 +196,6 @@ sub worker_quit {
# killing again terminates immediately:
exit unless @listeners;
- $_->close for @listeners;
@listeners = ();
# give slow clients 30s to finish reading/writing whatever
@@ -372,7 +375,9 @@ sub new ($$) {
listen($s, 1024);
IO::Handle::blocking($s, 0);
my $self = fields::new($class);
- $self->SUPER::new($s);
+ $self->SUPER::new($s); # calls epoll_create for the first socket
+ $self->watch_read(1);
+ $self
}
sub event_read {
--
EW
prev parent reply other threads:[~2015-09-24 3:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-24 3:37 [PATCH 0/7] another round of NNTP updates Eric Wong
2015-09-24 3:37 ` [PATCH 1/7] nntp: fix XOVER command Eric Wong
2015-09-24 3:37 ` [PATCH 2/7] nntpd: additional daemonization options Eric Wong
2015-09-24 3:37 ` [PATCH 3/7] nntpd: hard quit after 30s Eric Wong
2015-09-24 3:37 ` [PATCH 4/7] nntpd: move busy check to NNTP package Eric Wong
2015-09-24 3:37 ` [PATCH 5/7] nntp: avoid infinite loop on partial read Eric Wong
2015-09-24 3:37 ` [PATCH 6/7] nntpd: better encapsulation for shutdown Eric Wong
2015-09-24 3:37 ` 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: https://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=20150924033721.26231-8-e@80x24.org \
--to=e@80x24.org \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).