yahns Ruby server user/dev discussion
 help / color / mirror / code / 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

Code repositories for project(s) associated with this inbox:

	../../../yahns.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).