Logging: add referer info only to top level errors

c2cwsgiutils/errors.py

@@ -36,7 +36,8 @@ def _add_cors(request):
 @view_config(context=HTTPException, renderer="json", http_cache=0)
 def http_error(exception, request):
     LOG.warning("%s %s returned status code %s: %s",
-                request.method, request.url, exception.status_code, str(exception))
+                request.method, request.url, exception.status_code, str(exception),
+                extra={'referer': request.referer})
     if request.method != 'OPTIONS':
         request.response.status_code = exception.status_code
         _add_cors(request)
@@ -58,7 +59,8 @@ def other_error(exception, request):
 
 def _do_error(request, status, exception):
     LOG.error("%s %s returned status code %s: %s",
-              request.method, request.url, status, str(exception), exc_info=True)
+              request.method, request.url, status, str(exception),
+              extra={'referer': request.referer}, exc_info=True)
     request.response.status_code = status
     _add_cors(request)
     response = {"message": str(exception), "status": status}

c2cwsgiutils/pyramid_logging.py

@@ -35,8 +35,6 @@ def filter(self, record):
                 record.matched_route = request.matched_route.name
             record.path = request.path
             record.request_id = request.c2c_request_id
-            if request.referer is not None:
-                record.referer = request.referer
         record.level_name = record.levelname
         return True
 

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '0.19.1'
+VERSION = '0.19.2'
 HERE = os.path.abspath(os.path.dirname(__file__))
 INSTALL_REQUIRES = open(os.path.join(HERE, 'requirements.txt')).read().splitlines()