Merge pull request #1291 from lyft/add-environ-variables-to-logger

Add environment variables to gunicorn access log format
This commit is contained in:
Benoit Chesneau 2016-06-04 02:18:11 +02:00
commit ac708f5e44
2 changed files with 29 additions and 24 deletions

View File

@ -1091,30 +1091,31 @@ class AccessLogFormat(Setting):
desc = """\ desc = """\
The access log format. The access log format.
========== =========== =========== ===========
Identifier Description Identifier Description
========== =========== =========== ===========
h remote address h remote address
l ``'-'`` l ``'-'``
u user name u user name
t date of the request t date of the request
r status line (e.g. ``GET / HTTP/1.1``) r status line (e.g. ``GET / HTTP/1.1``)
m request method m request method
U URL path without query string U URL path without query string
q query string q query string
H protocol H protocol
s status s status
B response length B response length
b response length or ``'-'`` (CLF format) b response length or ``'-'`` (CLF format)
f referer f referer
a user agent a user agent
T request time in seconds T request time in seconds
D request time in microseconds D request time in microseconds
L request time in decimal seconds L request time in decimal seconds
p process ID p process ID
{Header}i request header {Header}i request header
{Header}o response header {Header}o response header
========== =========== {Variable}e environment variable
=========== ===========
""" """

View File

@ -303,6 +303,10 @@ class Logger(object):
# add response headers # add response headers
atoms.update(dict([("{%s}o" % k.lower(), v) for k, v in resp_headers])) atoms.update(dict([("{%s}o" % k.lower(), v) for k, v in resp_headers]))
# add environ variables
environ_variables = environ.items()
atoms.update(dict([("{%s}e" % k.lower(), v) for k, v in environ_variables]))
return atoms return atoms
def access(self, resp, req, environ, request_time): def access(self, resp, req, environ, request_time):