Merge pull request #2313 from benoitc/keepalive-graceful-shutdown

Disable keepalive during graceful shutdown
This commit is contained in:
Randall Leeds 2020-04-20 18:49:08 -07:00 committed by GitHub
commit a232c270fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -99,9 +99,8 @@ class AsyncWorker(base.Worker):
if self.alive:
self.log.info("Autorestarting worker after current request.")
self.alive = False
resp.force_close()
if not self.cfg.keepalive:
if not self.alive or not self.cfg.keepalive:
resp.force_close()
respiter = self.wsgi(environ, resp.start_response)

View File

@ -313,7 +313,7 @@ class ThreadWorker(base.Worker):
self.alive = False
resp.force_close()
if not self.cfg.keepalive:
if not self.alive or not self.cfg.keepalive:
resp.force_close()
elif len(self._keep) >= self.max_keepalived:
resp.force_close()