Merge pull request benoitc#1291 from lyft/add-environ-variables-to-lo…

…gger Add environment variables to gunicorn access log format
mjjbell · Jun 4, 2016 · 26c572c · 26c572c
2 parents ef5b0f7 + 7155338
commit 26c572c
Show file tree

Hide file tree

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

diff --git a/gunicorn/glogging.py b/gunicorn/glogging.py
@@ -303,6 +303,10 @@ def atoms(self, resp, req, environ, request_time):
         # add response 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
 
     def access(self, resp, req, environ, request_time):