Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Move transport close to finally statment

Browse Source
This commit is contained in:
Eli Uriegas 2017-01-19 16:35:48 -06:00
parent e9bfa30c1d
commit ed4752bbc0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sanic/server.py
View File

@ -168,12 +168,6 @@ class HttpProtocol(asyncio.Protocol):
self.transport.write( self.transport.write(
response.output( response.output(
self.request.version, keep_alive, self.request_timeout)) self.request.version, keep_alive, self.request_timeout))
if not keep_alive:
self.transport.close()
else:
# Record that we received data
self._last_request_time = current_time
self.cleanup()
except RuntimeError: except RuntimeError:
log.error( log.error(
'Connection lost before response written @ {}'.format( 'Connection lost before response written @ {}'.format(
@ -181,13 +175,19 @@ class HttpProtocol(asyncio.Protocol):
except Exception as e: except Exception as e:
self.bail_out( self.bail_out(
"Writing response failed, connection closed {}".format(e)) "Writing response failed, connection closed {}".format(e))
finally:
if not keep_alive:
self.transport.close()
else:
# Record that we received data
self._last_request_time = current_time
self.cleanup()
def write_error(self, exception): def write_error(self, exception):
try: try:
response = self.error_handler.response(self.request, exception) response = self.error_handler.response(self.request, exception)
version = self.request.version if self.request else '1.1' version = self.request.version if self.request else '1.1'
self.transport.write(response.output(version)) self.transport.write(response.output(version))
self.transport.close()
except RuntimeError: except RuntimeError:
log.error( log.error(
'Connection lost before error written @ {}'.format( 'Connection lost before error written @ {}'.format(
@ -196,6 +196,8 @@ class HttpProtocol(asyncio.Protocol):
self.bail_out( self.bail_out(
"Writing error failed, connection closed {}".format(e), "Writing error failed, connection closed {}".format(e),
from_error=True) from_error=True)
finally:
self.transport.close()
def bail_out(self, message, from_error=False): def bail_out(self, message, from_error=False):
if from_error and self.transport.is_closing(): if from_error and self.transport.is_closing():