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 4/7] nntpd: move busy check to NNTP package
Date: Thu, 24 Sep 2015 03:37:18 +0000	[thread overview]
Message-ID: <20150924033721.26231-5-e@80x24.org> (raw)
In-Reply-To: <20150924033721.26231-1-e@80x24.org>

This is better encapsulated and hopefully more readable.
While we're at it, check for being inside a long response, too.
---
 lib/PublicInbox/NNTP.pm | 5 +++++
 public-inbox-nntpd      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 0d0de97..52d6a64 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -919,4 +919,9 @@ sub watch_read {
 	$rv;
 }
 
+sub busy () {
+	my ($self) = @_;
+	($self->{rbuf} ne '' || $self->{long_res} || $self->{write_buf_size});
+}
+
 1;
diff --git a/public-inbox-nntpd b/public-inbox-nntpd
index 4c15608..70bab46 100644
--- a/public-inbox-nntpd
+++ b/public-inbox-nntpd
@@ -205,7 +205,7 @@ sub worker_quit {
 
 		foreach my $s (values %$dmap) {
 			next unless ref($s) eq 'PublicInbox::NNTP';
-			if ($s->{write_buf_size} || $s->{rbuf}) {
+			if ($s->busy) {
 				++$n;
 			} else {
 				$s->close;
-- 
EW


  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 ` Eric Wong [this message]
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 ` [PATCH 7/7] nntpd: support SIGUSR2 in single-process mode, too Eric Wong

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-5-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).