From 0816b773525838ded59d58ab0c9c09924f425a0c Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Wed, 1 May 2019 12:30:01 +0200 Subject: [PATCH] Fixed issue where not supplying es argument to logger threw an error. --- logger.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/logger.py b/logger.py index 1da60ed..29411d2 100644 --- a/logger.py +++ b/logger.py @@ -43,7 +43,7 @@ class ESHandler(logging.Handler): 'sessionID': str(self.sessionID) } - if record.es: + if hasattr(record, 'es'): for param in record.es.values(): if ': {}'.format(param) in record.message: doc['message'] = record.message.replace(': {}'.format(str(param)), '') @@ -62,6 +62,8 @@ class ElasticFieldParameterAdapter(logging.LoggerAdapter): super().__init__(logger, extra) def process(self, msg, kwargs): + if kwargs == {}: + return (msg, kwargs) extra = kwargs.get("extra", {}) extra.update({"es": kwargs.pop("es", True)}) kwargs["extra"] = extra