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 #2172 from benoitc/issue1925

Browse Source 
Capture os.sendfile before patching in gevent and eventlet workers.
This commit is contained in:
Jason Madden 2019-11-13 13:14:55 -06:00 committed by GitHub
commit 94ab209117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gunicorn/workers/geventlet.py
View File

@ -26,10 +26,10 @@ import greenlet
from gunicorn.workers.base_async import AsyncWorker from gunicorn.workers.base_async import AsyncWorker
def _eventlet_sendfile(fdout, fdin, offset, nbytes): def _eventlet_sendfile(fdout, fdin, offset, nbytes, _os_sendfile=os.sendfile):
while True: while True:
try: try:
return os.sendfile(fdout, fdin, offset, nbytes) return _os_sendfile(fdout, fdin, offset, nbytes)
except OSError as e: except OSError as e:
if e.args[0] == errno.EAGAIN: if e.args[0] == errno.EAGAIN:
trampoline(fdout, write=True) trampoline(fdout, write=True)

4
gunicorn/workers/ggevent.py
View File

@ -30,10 +30,10 @@ from gunicorn.workers.base_async import AsyncWorker
VERSION = "gevent/%s gunicorn/%s" % (gevent.__version__, gunicorn.__version__) VERSION = "gevent/%s gunicorn/%s" % (gevent.__version__, gunicorn.__version__)
def _gevent_sendfile(fdout, fdin, offset, nbytes): def _gevent_sendfile(fdout, fdin, offset, nbytes, _os_sendfile=os.sendfile):
while True: while True:
try: try:
return os.sendfile(fdout, fdin, offset, nbytes) return _os_sendfile(fdout, fdin, offset, nbytes)
except OSError as e: except OSError as e:
if e.args[0] == errno.EAGAIN: if e.args[0] == errno.EAGAIN:
socket.wait_write(fdout) socket.wait_write(fdout)