about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-01-08 18:34:57 +0000
committerEric Wong <e@80x24.org>2019-01-08 18:37:04 +0000
commit5938cd30e3a79a9e83ba620eb3d4560244e00bc5 (patch)
tree2d56184cecf5103b129efc14bce33283f15717e7 /lib
parent96825e8ca734cfbbc3a79b55d6abda9b2f553fe4 (diff)
downloadyahns-5938cd30e3a79a9e83ba620eb3d4560244e00bc5.tar.gz
Otherwise, listeners may still be injecting into the queue
and new clients may be accepted.

Fixes: 86ea6ed1417b ("server: respect shutdown_timeout")
Diffstat (limited to 'lib')
-rw-r--r--lib/yahns/server.rb2
1 files changed, 1 insertions, 1 deletions
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 @@ class Yahns::Server # :nodoc:
     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..