From efdca7b8e80e74501d14eb0bee74f78309db287b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 5 Mar 2016 05:44:16 +0000 Subject: daemon: drop listener sockets ASAP on termination We do not want to be accepting connections during graceful shutdown because another new process is likely taking over. This also allows us to free up the listener case another (independent) process wants to claim it. --- lib/PublicInbox/Daemon.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/PublicInbox/Daemon.pm') diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm index f0be034c..c3199cd2 100644 --- a/lib/PublicInbox/Daemon.pm +++ b/lib/PublicInbox/Daemon.pm @@ -137,6 +137,7 @@ sub worker_quit () { # killing again terminates immediately: exit unless @listeners; + $_->close foreach @listeners; # call Danga::Socket::close @listeners = (); # give slow clients 30s to finish reading/writing whatever @@ -401,7 +402,9 @@ sub daemon_loop ($$) { $SIG{USR1} = *reopen_logs; $SIG{HUP} = $refresh; # this calls epoll_create: - PublicInbox::Listener->new($_, $post_accept) for @listeners; + @listeners = map { + PublicInbox::Listener->new($_, $post_accept) + } @listeners; Danga::Socket->EventLoop; $parent_pipe = undef; } -- cgit v1.2.3-24-ge0c7