yahns Ruby server user/dev discussion
 help / color / mirror / Atom feed
* [PATCH] do not shutdown until listeners are all stopped
@ 2019-01-08 18:37 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2019-01-08 18:37 UTC (permalink / raw)
  To: yahns-public

Otherwise, listeners may still be injecting into the queue
and new clients may be accepted.

Fixes: 86ea6ed1417b ("server: respect shutdown_timeout")
---
 lib/yahns/server.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/yahns/server.rb b/lib/yahns/server.rb
index c078ade..d13c57e 100644
--- a/lib/yahns/server.rb
+++ b/lib/yahns/server.rb
@@ -500,7 +500,7 @@ def dropping(fdmap)
     if drop_acceptors[0] || fdmap.size > 0
       timeout = @shutdown_expire < Yahns.now ? -1 : @shutdown_timeout
       n = fdmap.desperate_expire(timeout)
-      return false if n == 0 # all done!
+      return false if n == 0 && @listeners.empty? # all done!
 
       # FIXME: sometimes shutdowns take a long time when using proxy_pass
       # Still not sure what's going on and it takes a while to reproduce..
-- 
EW


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2019-01-08 18:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-08 18:37 [PATCH] do not shutdown until listeners are all stopped Eric Wong

yahns Ruby server user/dev discussion

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhbt.net/yahns-public
	git clone --mirror http://ou63pmih66umazou.onion/yahns-public

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 yahns-public yahns-public/ https://yhbt.net/yahns-public \
		yahns-public@yhbt.net yahns-public@rubyforge.org
	public-inbox-index yahns-public

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.lang.ruby.yahns
	nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.yahns
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for the project(s) associated with this inbox:

	yahns.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git