Use a dynamic timeout to wait for the optimal time.

lyft · Jan 30, 2014 · d76bab4 · d76bab4
1 parent 89a178a
commit d76bab4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py
@@ -308,8 +308,15 @@ def sleep(self):
         Sleep until PIPE is readable or we timeout.
         A readable PIPE means a signal occurred.
         """
+        if self.WORKERS:
+            oldest = min(w.tmp.last_update() for w in self.WORKERS.values())
+            timeout = self.timeout - (time.time() - oldest)
+            # The timeout can be reached, so don't wait for a negative value
+            timeout = max(timeout, 1.0)
+        else:
+            timeout = 1.0
         try:
-            ready = select.select([self.PIPE[0]], [], [], 1.0)
+            ready = select.select([self.PIPE[0]], [], [], timeout)
             if not ready[0]:
                 return
             while os.read(self.PIPE[0], 1):