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

Timeouts in SimpleAsyncHTTPClient now raise HTTPError 

Previously, they ran the callbacks themselves.
This commit is contained in:
Alek Storm 2012-06-03 15:14:55 -04:00
parent 13598908a7
commit 4965811fbc
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tornado/simple_httpclient.py
View File

@ -221,7 +221,7 @@ class _HTTPConnection(object):
if timeout: if timeout:
self._timeout = self.io_loop.add_timeout( self._timeout = self.io_loop.add_timeout(
self.start_time + timeout, self.start_time + timeout,
self._on_timeout) stack_context.wrap(self._on_timeout))
self.stream.set_close_callback(self._on_close) self.stream.set_close_callback(self._on_close)
self.stream.connect(sockaddr, self.stream.connect(sockaddr,
functools.partial(self._on_connect, parsed, functools.partial(self._on_connect, parsed,
@ -229,10 +229,8 @@ class _HTTPConnection(object):
def _on_timeout(self): def _on_timeout(self):
self._timeout = None self._timeout = None
self._run_callback(HTTPResponse(self.request, 599, if self.final_callback is not None:
request_time=time.time() - self.start_time, raise HTTPError(599, "Timeout")
error=HTTPError(599, "Timeout")))
self.stream.close()
def _on_connect(self, parsed, parsed_hostname): def _on_connect(self, parsed, parsed_hostname):
if self._timeout is not None: if self._timeout is not None:
@ -241,7 +239,7 @@ class _HTTPConnection(object):
if self.request.request_timeout: if self.request.request_timeout:
self._timeout = self.io_loop.add_timeout( self._timeout = self.io_loop.add_timeout(
self.start_time + self.request.request_timeout, self.start_time + self.request.request_timeout,
self._on_timeout) stack_context.wrap(self._on_timeout))
if (self.request.validate_cert and if (self.request.validate_cert and
isinstance(self.stream, SSLIOStream)): isinstance(self.stream, SSLIOStream)):
match_hostname(self.stream.socket.getpeercert(), match_hostname(self.stream.socket.getpeercert(),
@ -330,10 +328,8 @@ class _HTTPConnection(object):
self.stream.close() self.stream.close()
def _on_close(self): def _on_close(self):
self._run_callback(HTTPResponse( if self.final_callback is not None:
self.request, 599, raise HTTPError(599, "Connection closed")
request_time=time.time() - self.start_time,
error=HTTPError(599, "Connection closed")))
def _on_headers(self, data): def _on_headers(self, data):
data = native_str(data.decode("latin1")) data = native_str(data.decode("latin1"))