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

middleware: Show client version in logging if available.

Browse Source 
Fixes #14067.
This commit is contained in:
orientor
2020-03-11 23:38:44 +05:30
committed by Tim Abbott
parent ac203cd9f1
commit fe260fb892
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/middleware.py
View File

@@ -140,6 +140,7 @@ def write_log_line(
remote_ip: str, remote_ip: str,
requestor_for_logs: str, requestor_for_logs: str,
client_name: str, client_name: str,
client_version: Optional[str] = None,
status_code: int = 200, status_code: int = 200,
error_content: Optional[AnyStr] = None, error_content: Optional[AnyStr] = None,
error_content_iter: Optional[Iterable[AnyStr]] = None, error_content_iter: Optional[Iterable[AnyStr]] = None,
@@ -246,7 +247,10 @@ def write_log_line(
extra_request_data = " {}".format(log_data["extra"]) extra_request_data = " {}".format(log_data["extra"])
else: else:
extra_request_data = "" extra_request_data = ""
logger_client = f"({requestor_for_logs} via {client_name})" if client_version is None:
logger_client = f"({requestor_for_logs} via {client_name})"
else:
logger_client = f"({requestor_for_logs} via {client_name}/{client_version})"
logger_timing = f"{format_timedelta(time_delta):>5}{optional_orig_delta}{remote_cache_output}{markdown_output}{db_time_output}{startup_output} {path}" logger_timing = f"{format_timedelta(time_delta):>5}{optional_orig_delta}{remote_cache_output}{markdown_output}{db_time_output}{startup_output} {path}"
logger_line = f"{remote_ip:<15} {method:<7} {status_code:3} {logger_timing}{extra_request_data} {logger_client}" logger_line = f"{remote_ip:<15} {method:<7} {status_code:3} {logger_timing}{extra_request_data} {logger_client}"
if status_code in [200, 304] and method == "GET" and path.startswith("/static"): if status_code in [200, 304] and method == "GET" and path.startswith("/static"):
@@ -368,6 +372,7 @@ class LogRequests(MiddlewareMixin):
remote_ip, remote_ip,
requestor_for_logs, requestor_for_logs,
client, client,
client_version=request.client_version,
status_code=response.status_code, status_code=response.status_code,
error_content=content, error_content=content,
error_content_iter=content_iter, error_content_iter=content_iter,