Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for eventlets _AlreadyHandled object #1406

Merged
merged 5 commits into from
Dec 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion gunicorn/workers/async.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ def __init__(self, *args, **kwargs):
def timeout_ctx(self):
raise NotImplementedError()

def is_already_handled(self, respiter):
# some workers will need to overload this function to raise a StopIteration
return respiter == ALREADY_HANDLED

def handle(self, listener, client, addr):
req = None
try:
Expand Down Expand Up @@ -101,7 +105,7 @@ def handle_request(self, listener_name, req, sock, addr):
resp.force_close()

respiter = self.wsgi(environ, resp.start_response)
if respiter == ALREADY_HANDLED:
if self.is_already_handled(respiter):
return False
try:
if isinstance(respiter, environ['wsgi.file_wrapper']):
Expand Down
7 changes: 7 additions & 0 deletions gunicorn/workers/geventlet.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from eventlet import hubs, greenthread
from eventlet.greenio import GreenSocket
from eventlet.hubs import trampoline
from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
import greenlet

from gunicorn.http.wsgi import sendfile as o_sendfile
Expand Down Expand Up @@ -91,6 +92,12 @@ def patch(self):
eventlet.monkey_patch(os=False)
patch_sendfile()

def is_already_handled(self, respiter):
if respiter == EVENTLET_ALREADY_HANDLED:
raise StopIteration()
else:
return super(EventletWorker, self).is_already_handled(respiter)

def init_process(self):
self.patch()
super(EventletWorker, self).init_process()
Expand Down