From 5938cd30e3a79a9e83ba620eb3d4560244e00bc5 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Tue, 8 Jan 2019 18:34:57 +0000
Subject: do not shutdown until listeners are all stopped

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(-)

(limited to 'lib')

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..
-- 
cgit v1.2.3-24-ge0c7