paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the user's client string to our Django logs.

Browse Source 
This should let us distinguish e.g. mobile from API bots.

(imported from commit 192114a0f79bfa7fb918e8c026da63ef772c2449)
This commit is contained in:
Tim Abbott
2013-03-15 13:57:58 -04:00
parent a46eb8a36c
commit e080be82fb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zephyr/middleware.py
View File

@@ -28,16 +28,20 @@ class LogRequests(object):
# Get the amount of time spent doing database queries # Get the amount of time spent doing database queries
query_time = sum(float(query.get('time', 0)) for query in connection.queries) query_time = sum(float(query.get('time', 0)) for query in connection.queries)
# Get the requestor's email address, if available. # Get the requestor's email address and client, if available.
try: try:
email = request._email email = request._email
except Exception: except Exception:
email = "unauth" email = "unauth"
try:
client = request._client.name
except Exception:
client = "?"
logger.info('%-15s %-7s %3d %.3fs (db: %.3fs/%sq) %s (%s)' logger.info('%-15s %-7s %3d %.3fs (db: %.3fs/%sq) %s (%s via %s)'
% (remote_ip, request.method, response.status_code, % (remote_ip, request.method, response.status_code,
time_delta, query_time, len(connection.queries), time_delta, query_time, len(connection.queries),
request.get_full_path(), email)) request.get_full_path(), email, client))
# Log some additional data whenever we return certain 40x errors # Log some additional data whenever we return certain 40x errors
if 400 <= response.status_code < 500 and response.status_code not in [401, 404, 405]: if 400 <= response.status_code < 500 and response.status_code not in [401, 404, 405]: