jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve worker shutdown

Browse Source
This commit is contained in:
benoitc 2014-05-31 01:21:05 +02:00
parent fb53047b73
commit d775b576e8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gunicorn/workers/gthread.py
View File

@ -84,7 +84,6 @@ class ThreadWorker(base.Worker):
self.futures = deque() self.futures = deque()
self._keep = deque() self._keep = deque()
def _wrap_future(self, fs, conn): def _wrap_future(self, fs, conn):
fs.conn = conn fs.conn = conn
self.futures.append(fs) self.futures.append(fs)
@ -117,7 +116,6 @@ class ThreadWorker(base.Worker):
fs = self.tpool.submit(self.handle, conn) fs = self.tpool.submit(self.handle, conn)
self._wrap_future(fs, conn) self._wrap_future(fs, conn)
def murder_keepalived(self): def murder_keepalived(self):
now = time.time() now = time.time()
while True: while True:
@ -178,7 +176,12 @@ class ThreadWorker(base.Worker):
futures.wait(self.futures, timeout=self.cfg.graceful_timeout) futures.wait(self.futures, timeout=self.cfg.graceful_timeout)
# if we have still fures running, try to close them # if we have still fures running, try to close them
for fs in self.futures: while True:
try:
fs = self.futures.popleft()
except IndexError:
break
sock = fs.conn.sock sock = fs.conn.sock
# the future is not running, cancel it # the future is not running, cancel it
@ -279,7 +282,6 @@ class ThreadWorker(base.Worker):
resp.force_close() resp.force_close()
self.alive = False self.alive = False
if not self.cfg.keepalive: if not self.cfg.keepalive:
resp.force_close() resp.force_close()