paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-17 04:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

logging: Attribute each log message to the logger it came through.

Browse Source 
This also gives us a place to hang the originating module, if we write a bit
of logic to work that out; sadly it doesn't come out of the box, only
the filename (which is likely to have a bunch of noise that just shows the
path to the deployment or virtualenv.)
This commit is contained in:
Greg Price
2017-09-26 16:42:03 -07:00
parent bfc245574c
commit 71b8e7e8d4
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/logging_util.py
View File

@@ -125,11 +125,18 @@ def skip_site_packages_logs(record):
return False return False
return True return True
def find_log_origin(record):
# type: (logging.LogRecord) -> str
if record.name == 'root':
return ''
else:
return record.name
class ZulipFormatter(logging.Formatter): class ZulipFormatter(logging.Formatter):
# Used in the base implementation. Default uses `,`. # Used in the base implementation. Default uses `,`.
default_msec_format = '%s.%03d' default_msec_format = '%s.%03d'
_fmt = '%(asctime)s %(levelname)-8s %(message)s' _fmt = '%(asctime)s %(levelname)-8s [%(zulip_origin)s] %(message)s'
def __init__(self): def __init__(self):
# type: () -> None # type: () -> None
@@ -137,6 +144,11 @@ class ZulipFormatter(logging.Formatter):
def format(self, record): def format(self, record):
# type: (logging.LogRecord) -> str # type: (logging.LogRecord) -> str
if not getattr(record, 'zulip_decorated', False):
# The `setattr` calls put this logic explicitly outside the bounds of the
# type system; otherwise mypy would complain LogRecord lacks these attributes.
setattr(record, 'zulip_origin', find_log_origin(record))
setattr(record, 'zulip_decorated', True)
return super().format(record) return super().format(record)
def create_logger(name, log_file, log_level, log_format="%(asctime)s %(levelname)-8s %(message)s"): def create_logger(name, log_file, log_level, log_format="%(asctime)s %(levelname)-8s %(message)s"):