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

Merge branch 'master' of github.com:channelcat/sanic into add_app_loop_safety

Browse Source
This commit is contained in:
Eli Uriegas
2017-02-17 07:10:59 -06:00
parent 39aa64ff68 072f7fec30
commit c75d484f23
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sanic/server.py
View File

@@ -167,19 +167,26 @@ class HttpProtocol(asyncio.Protocol):
# -------------------------------------------- #
def write_response(self, response):
keep_alive = (
self.parser.should_keep_alive() and not self.signal.stopped)
try:
keep_alive = (
self.parser.should_keep_alive() and not self.signal.stopped)
self.transport.write(
response.output(
self.request.version, keep_alive, self.request_timeout))
except AttributeError:
log.error(
('Invalid response object for url {}, '
'Expected Type: HTTPResponse, Actual Type: {}').format(
self.url, type(response)))
self.write_error(ServerError('Invalid response type'))
except RuntimeError:
log.error(
'Connection lost before response written @ {}'.format(
self.request.ip))
except Exception as e:
self.bail_out(
"Writing response failed, connection closed {}".format(e))
"Writing response failed, connection closed {}".format(
repr(e)))
finally:
if not keep_alive:
self.transport.close()
@@ -196,10 +203,10 @@ class HttpProtocol(asyncio.Protocol):
except RuntimeError:
log.error(
'Connection lost before error written @ {}'.format(
self.request.ip))
self.request.ip if self.request else 'Unknown'))
except Exception as e:
self.bail_out(
"Writing error failed, connection closed {}".format(e),
"Writing error failed, connection closed {}".format(repr(e)),
from_error=True)
finally:
self.transport.close()