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 #1228 from lyft/circular-ref-async-fd-leak-fix

Browse Source 
Fix delayed socket close caused by circular ref from assigning traceback to local var
This commit is contained in:
Randall Leeds 2016-03-19 18:18:28 -07:00
commit 5b32dde3ef
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gunicorn/_compat.py
View File

@ -107,11 +107,8 @@ def _wrap_error(exc, mapping, key):
new_err = new_err_cls(*exc.args) new_err = new_err_cls(*exc.args)
# raise a new exception with the original traceback # raise a new exception with the original traceback
if hasattr(exc, '__traceback__'): six.reraise(new_err_cls, new_err,
traceback = exc.__traceback__ exc.__traceback__ if hasattr(exc, '__traceback__') else sys.exc_info()[2])
else:
traceback = sys.exc_info()[2]
six.reraise(new_err_cls, new_err, traceback)
if PY33: if PY33:
import builtins import builtins

6
gunicorn/workers/async.py
View File

@ -55,13 +55,11 @@ class AsyncWorker(base.Worker):
except StopIteration as e: except StopIteration as e:
self.log.debug("Closing connection. %s", e) self.log.debug("Closing connection. %s", e)
except ssl.SSLError: except ssl.SSLError:
exc_info = sys.exc_info()
# pass to next try-except level # pass to next try-except level
six.reraise(exc_info[0], exc_info[1], exc_info[2]) six.reraise(*sys.exc_info())
except EnvironmentError: except EnvironmentError:
exc_info = sys.exc_info()
# pass to next try-except level # pass to next try-except level
six.reraise(exc_info[0], exc_info[1], exc_info[2]) six.reraise(*sys.exc_info())
except Exception as e: except Exception as e:
self.handle_error(req, client, addr, e) self.handle_error(req, client, addr, e)
except ssl.SSLError as e: except ssl.SSLError as e:

15
gunicorn/workers/base.py
View File

@ -134,11 +134,18 @@ class Worker(object):
self.log.exception(e) self.log.exception(e)
exc_type, exc_val, exc_tb = sys.exc_info() # fix from PR #1228
self.reloader.add_extra_file(exc_val.filename) # storing the traceback into exc_tb will create a circular reference.
# per https://docs.python.org/2/library/sys.html#sys.exc_info warning,
# delete the traceback after use.
try:
exc_type, exc_val, exc_tb = sys.exc_info()
self.reloader.add_extra_file(exc_val.filename)
tb_string = traceback.format_exc(exc_tb) tb_string = traceback.format_exc(exc_tb)
self.wsgi = util.make_fail_app(tb_string) self.wsgi = util.make_fail_app(tb_string)
finally:
del exc_tb
def init_signals(self): def init_signals(self):
# reset signaling # reset signaling

3
gunicorn/workers/gthread.py
View File

@ -339,9 +339,8 @@ class ThreadWorker(base.Worker):
self.log.debug("Closing connection.") self.log.debug("Closing connection.")
return False return False
except EnvironmentError: except EnvironmentError:
exc_info = sys.exc_info()
# pass to next try-except level # pass to next try-except level
six.reraise(exc_info[0], exc_info[1], exc_info[2]) six.reraise(*sys.exc_info())
except Exception: except Exception:
if resp and resp.headers_sent: if resp and resp.headers_sent:
# If the requests have already been sent, we should close the # If the requests have already been sent, we should close the

3
gunicorn/workers/sync.py
View File

@ -182,9 +182,8 @@ class SyncWorker(base.Worker):
if hasattr(respiter, "close"): if hasattr(respiter, "close"):
respiter.close() respiter.close()
except EnvironmentError: except EnvironmentError:
exc_info = sys.exc_info()
# pass to next try-except level # pass to next try-except level
six.reraise(exc_info[0], exc_info[1], exc_info[2]) six.reraise(*sys.exc_info())
except Exception: except Exception:
if resp and resp.headers_sent: if resp and resp.headers_sent:
# If the requests have already been sent, we should close the # If the requests have already been sent, we should close the