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.

Sign up for GitHub

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

Fix eventlet graceful timeout handling #1725

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix eventlet graceful timeout handling #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gunicorn/workers/async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def handle(self, listener, client, addr):
try:
parser = http.RequestParser(self.cfg, client)
try:
listener_name = listener.getsockname()
listener_name = client.getsockname()
if not self.cfg.keepalive:
req = six.next(parser)
self.handle_request(listener_name, req, client, addr)
Expand Down
11 changes: 8 additions & 3 deletions gunicorn/workers/geventlet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,18 @@ def _eventlet_serve(sock, handle, concurrency):
pool = eventlet.greenpool.GreenPool(concurrency)
server_gt = eventlet.greenthread.getcurrent()

def _eventlet_handle(conn, addr):
gt = pool.spawn(handle, conn, addr)
gt.link(_eventlet_stop, server_gt, conn)

while True:
conn, addr = None, None
try:
conn, addr = sock.accept()
gt = pool.spawn(handle, conn, addr)
gt.link(_eventlet_stop, server_gt, conn)
conn, addr, gt = None, None, None
_eventlet_handle(conn, addr)
except eventlet.StopServe:
if conn and addr:
_eventlet_handle(conn, addr)
sock.close()
pool.waitall()
return
Expand Down