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

Merge pull request #863 from zyguan/issue-760

Browse Source 
handle keep-alive timeout gracefully
This commit is contained in:
Raphael Deem 2017-07-25 00:54:43 -07:00 committed by GitHub
commit eb06e6ba51
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sanic/server.py
View File

@ -139,7 +139,9 @@ class HttpProtocol(asyncio.Protocol):
self._request_stream_task.cancel() self._request_stream_task.cancel()
if self._request_handler_task: if self._request_handler_task:
self._request_handler_task.cancel() self._request_handler_task.cancel()
exception = RequestTimeout('Request Timeout') try:
raise RequestTimeout('Request Timeout')
except RequestTimeout as exception:
self.write_error(exception) self.write_error(exception)
# -------------------------------------------- # # -------------------------------------------- #
@ -317,6 +319,7 @@ class HttpProtocol(asyncio.Protocol):
self.cleanup() self.cleanup()
def write_error(self, exception): def write_error(self, exception):
response = None
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'
@ -331,19 +334,22 @@ class HttpProtocol(asyncio.Protocol):
from_error=True) from_error=True)
finally: finally:
if self.has_log: if self.has_log:
extra = { extra = dict()
'status': response.status, if isinstance(response, HTTPResponse):
'host': '', extra['status'] = response.status
'request': str(self.request) + str(self.url)
}
if response and isinstance(response, HTTPResponse):
extra['byte'] = len(response.body) extra['byte'] = len(response.body)
else: else:
extra['status'] = 0
extra['byte'] = -1 extra['byte'] = -1
if self.request: if self.request:
extra['host'] = '%s:%d' % self.request.ip, extra['host'] = '%s:%d' % self.request.ip,
extra['request'] = '%s %s' % (self.request.method, extra['request'] = '%s %s' % (self.request.method,
self.url) self.url)
else:
extra['host'] = 'UNKNOWN'
extra['request'] = 'nil'
if self.parser and not (self.keep_alive
and extra['status'] == 408):
netlog.info('', extra=extra) netlog.info('', extra=extra)
self.transport.close() self.transport.close()