Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't catch and hide exceptions caused by callbacks in http client

This commit is contained in:
Rhett Garber 2012-12-07 16:13:57 -08:00
parent 6cf1fa1333
commit 11f90d0718
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tornado/simple_httpclient.py
View File

@ -316,12 +316,20 @@ class _HTTPConnection(object):
try: try:
yield yield
except Exception, e: except Exception, e:
if self.final_callback:
gen_log.warning("uncaught exception", exc_info=True) gen_log.warning("uncaught exception", exc_info=True)
self._run_callback(HTTPResponse(self.request, 599, error=e, self._run_callback(HTTPResponse(self.request, 599, error=e,
request_time=self.io_loop.time() - self.start_time, request_time=self.io_loop.time() - self.start_time,
)) ))
if hasattr(self, "stream"): if hasattr(self, "stream"):
self.stream.close() self.stream.close()
else:
# If our callback has already been called, we are probably
# catching an exception that is not caused by us but rather
# some child of our callback. Rather than drop it on the floor,
# pass it along.
raise
def _on_close(self): def _on_close(self):
if self.final_callback is not None: if self.final_callback is not None: