paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log requestor email address for non-error requests too.

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

(imported from commit cbea49fd1e11805cadf564bd9160d3d6bf7e0eca)
This commit is contained in:
Tim Abbott
2013-02-11 17:15:34 -05:00
parent 67a41143f5
commit c24e05f0e9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zephyr/decorator.py
View File

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

14
zephyr/middleware.py
View File

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