Log requestor email address for non-error requests too.

This should make it much easier to debug issues where a particular
user is hosing our API, for example.

(imported from commit cbea49fd1e11805cadf564bd9160d3d6bf7e0eca)

zephyr/decorator.py

@@ -144,6 +144,7 @@ def internal_notify_view(view_func):
             # This is not a security check; it's an internal assertion
             # to help us find bugs.
             raise RuntimeError, 'notify view called with no Tornado handler'
+        request._email = "internal"
         return view_func(request, *args, **kwargs)
     return _wrapped_view_func
 

zephyr/middleware.py

@@ -22,15 +22,17 @@ class LogRequests(object):
         # didn't run for some reason
         if hasattr(request, '_time_started'):
             time_delta = time.time() - request._time_started
-        logger.info('%-15s %-7s %3d %.3fs %s'
-            % (remote_ip, request.method, response.status_code,
-               time_delta, request.get_full_path()))
-        # Log some additional data whenever we return a 40x error
-        if 400 <= response.status_code < 500:
+
         try:
             email = request._email
-            except:
-                email = "unknown"
+        except Exception:
+            email = "unauth"
+
+        logger.info('%-15s %-7s %3d %.3fs %s (%s)'
+            % (remote_ip, request.method, response.status_code,
+               time_delta, request.get_full_path(), email))
+        # Log some additional data whenever we return a 40x error
+        if 400 <= response.status_code < 500:
             logger.info('status=%3d, data=%s, uid=%s' % (response.status_code, response.content, email))
         return response