user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/2] daemon: be less misleading about graceful shutdown
Date: Sat, 18 Jun 2016 21:54:30 +0000	[thread overview]
Message-ID: <20160618215430.6662-3-e@80x24.org> (raw)
In-Reply-To: <20160618215430.6662-1-e@80x24.org>

We do not need to count the httpd.async object
against our running client count, that is tied to
the socket of the actual client.

This prevents misleading sysadmins about connected
clients during shutdown.
---
 lib/PublicInbox/Daemon.pm      | 3 ++-
 lib/PublicInbox/HTTPD/Async.pm | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index b76b9ff..a25dd90 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -180,7 +180,8 @@ sub worker_quit {
 		my $n = 0;
 
 		foreach my $s (values %$dmap) {
-			if ($s->can('busy') && $s->busy) {
+			$s->can('busy') or next;
+			if ($s->busy) {
 				++$n;
 			} else {
 				# close as much as possible, early as possible
diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index fadf2d3..a936d9b 100644
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -74,7 +74,4 @@ sub close {
 	PublicInbox::EvCleanup::asap($cleanup) if $cleanup;
 }
 
-# do not let ourselves be closed during graceful termination
-sub busy () { $_[0]->{cb} }
-
 1;

      parent reply	other threads:[~2016-06-18 21:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-18 21:54 [PATCH 0/2] graceful shutdown tweaks Eric Wong
2016-06-18 21:54 ` [PATCH 1/2] spawn: try to keep signals blocked in spawned child Eric Wong
2016-06-18 21:54 ` 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=20160618215430.6662-3-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).