KevinMidboe/transatlanticTorrentExpress
1
0
Fork 0
mirror of https://github.com/KevinMidboe/transatlanticTorrentExpress.git synced 2025-10-29 18:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue where not supplying es argument to logger threw an error.

Browse Source
This commit is contained in:
Kevin
2019-05-01 12:30:01 +02:00
parent 75faa5c949
commit 0816b77352
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logger.py
View File

@@ -43,7 +43,7 @@ class ESHandler(logging.Handler):
'sessionID': str(self.sessionID) 'sessionID': str(self.sessionID)
} }
if record.es: if hasattr(record, 'es'):
for param in record.es.values(): for param in record.es.values():
if ': {}'.format(param) in record.message: if ': {}'.format(param) in record.message:
doc['message'] = record.message.replace(': {}'.format(str(param)), '') doc['message'] = record.message.replace(': {}'.format(str(param)), '')
@@ -62,6 +62,8 @@ class ElasticFieldParameterAdapter(logging.LoggerAdapter):
super().__init__(logger, extra) super().__init__(logger, extra)
def process(self, msg, kwargs): def process(self, msg, kwargs):
if kwargs == {}:
return (msg, kwargs)
extra = kwargs.get("extra", {}) extra = kwargs.get("extra", {})
extra.update({"es": kwargs.pop("es", True)}) extra.update({"es": kwargs.pop("es", True)})
kwargs["extra"] = extra kwargs["extra"] = extra