Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve comments in the structured logging code. (#10188)

This commit is contained in:
Patrick Cloke 2021-06-16 14:18:02 -04:00 committed by GitHub
parent 76f9c701c3
commit 18edc9ab06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/10188.misc Normal file
View File

@ -0,0 +1 @@
Improve comments in structured logging code.

9
synapse/logging/_terse_json.py
View File

@ -20,8 +20,9 @@ import logging
_encoder = json.JSONEncoder(ensure_ascii=False, separators=(",", ":")) _encoder = json.JSONEncoder(ensure_ascii=False, separators=(",", ":"))
# The properties of a standard LogRecord. # The properties of a standard LogRecord that should be ignored when generating
_LOG_RECORD_ATTRIBUTES = { # JSON logs.
_IGNORED_LOG_RECORD_ATTRIBUTES = {
"args", "args",
"asctime", "asctime",
"created", "created",
@ -59,9 +60,9 @@ class JsonFormatter(logging.Formatter):
return self._format(record, event) return self._format(record, event)
def _format(self, record: logging.LogRecord, event: dict) -> str: def _format(self, record: logging.LogRecord, event: dict) -> str:
# Add any extra attributes to the event. # Add attributes specified via the extra keyword to the logged event.
for key, value in record.__dict__.items(): for key, value in record.__dict__.items():
if key not in _LOG_RECORD_ATTRIBUTES: if key not in _IGNORED_LOG_RECORD_ATTRIBUTES:
event[key] = value event[key] = value
return _encoder.encode(event) return _encoder.encode(event)