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

Merge pull request #960 from piotrbulinski/refactor_server_access_log

Browse Source 
Refactor access log for server.HttpProtocol
This commit is contained in:
Raphael Deem 2017-10-05 20:20:28 -07:00 committed by GitHub
commit 086b5daa53
1 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
sanic/server.py
View File

@ -300,6 +300,28 @@ class HttpProtocol(asyncio.Protocol):
# -------------------------------------------- # # -------------------------------------------- #
# Responding # Responding
# -------------------------------------------- # # -------------------------------------------- #
def log_response(self, response):
if self.access_log:
extra = {
'status': getattr(response, 'status', 0),
}
if isinstance(response, HTTPResponse):
extra['byte'] = len(response.body)
else:
extra['byte'] = -1
if self.request:
extra['host'] = '{0}:{1}'.format(self.request.ip[0],
self.request.ip[1])
extra['request'] = '{0} {1}'.format(self.request.method,
self.request.url)
else:
extra['host'] = 'UNKNOWN'
extra['request'] = 'nil'
access_logger.info('', extra=extra)
def write_response(self, response): def write_response(self, response):
""" """
Writes response content synchronously to the transport. Writes response content synchronously to the transport.
@ -313,15 +335,7 @@ class HttpProtocol(asyncio.Protocol):
response.output( response.output(
self.request.version, keep_alive, self.request.version, keep_alive,
self.keep_alive_timeout)) self.keep_alive_timeout))
if self.access_log: self.log_response(response)
access_logger.info('', extra={
'status': response.status,
'byte': len(response.body),
'host': '{0}:{1}'.format(self.request.ip[0],
self.request.ip[1]),
'request': '{0} {1}'.format(self.request.method,
self.request.url)
})
except AttributeError: except AttributeError:
logger.error( logger.error(
('Invalid response object for url {}, ' ('Invalid response object for url {}, '
@ -360,15 +374,7 @@ class HttpProtocol(asyncio.Protocol):
response.transport = self.transport response.transport = self.transport
await response.stream( await response.stream(
self.request.version, keep_alive, self.keep_alive_timeout) self.request.version, keep_alive, self.keep_alive_timeout)
if self.access_log: self.log_response(response)
access_logger.info('', extra={
'status': response.status,
'byte': -1,
'host': '{0}:{1}'.format(self.request.ip[0],
self.request.ip[1]),
'request': '{0} {1}'.format(self.request.method,
self.request.url)
})
except AttributeError: except AttributeError:
logger.error( logger.error(
('Invalid response object for url {}, ' ('Invalid response object for url {}, '
@ -414,24 +420,9 @@ class HttpProtocol(asyncio.Protocol):
repr(e)), from_error=True repr(e)), from_error=True
) )
finally: finally:
if self.access_log: if self.parser and (self.keep_alive
extra = dict() or getattr(response, 'status', 0) == 408):
if isinstance(response, HTTPResponse): self.log_response(response)
extra['status'] = response.status
extra['byte'] = len(response.body)
else:
extra['status'] = 0
extra['byte'] = -1
if self.request:
extra['host'] = '%s:%d' % self.request.ip,
extra['request'] = '%s %s' % (self.request.method,
self.url)
else:
extra['host'] = 'UNKNOWN'
extra['request'] = 'nil'
if self.parser and not (self.keep_alive
and extra['status'] == 408):
access_logger.info('', extra=extra)
self.transport.close() self.transport.close()
def bail_out(self, message, from_error=False): def bail_out(self, message, from_error=False):