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

Merge pull request #1257 from benoitc/fix/1256

Browse Source 
unblock the wait loop under python 3.5
This commit is contained in:
Benoit Chesneau 2016-05-10 21:14:47 +02:00
commit 58f190d346
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gunicorn/workers/base.py
View File

@ -113,6 +113,8 @@ class Worker(object):
[util.close_on_exec(s) for s in self.sockets]
util.close_on_exec(self.tmp.fileno())
self.wait_fds = self.sockets + [self.PIPE[0]]
self.log.close_on_exec()
self.init_signals()
@ -164,6 +166,9 @@ class Worker(object):
signal.siginterrupt(signal.SIGTERM, False)
signal.siginterrupt(signal.SIGUSR1, False)
if hasattr(signal, 'set_wakeup_fd'):
signal.set_wakeup_fd(self.PIPE[1])
def handle_usr1(self, sig, frame):
self.log.reopen_files()

5
gunicorn/workers/sync.py
View File

@ -32,7 +32,7 @@ class SyncWorker(base.Worker):
def wait(self, timeout):
try:
self.notify()
ret = select.select(self.sockets, [], self.PIPE, timeout)
ret = select.select(self.wait_fds, [], [], timeout)
if ret[0]:
return ret[0]
@ -93,6 +93,9 @@ class SyncWorker(base.Worker):
if ready is not None:
for listener in ready:
if listener == self.PIPE[0]:
continue
try:
self.accept(listener)
except EnvironmentError as e: