From f14c580266f4ea5f347a6db18ac3399dfd5e583d Mon Sep 17 00:00:00 2001 From: Roi Rav-Hon Date: Wed, 9 May 2018 20:46:58 +0300 Subject: [PATCH] Treat exception and non-exception the same --- README.md | 1 + logzio/handler.py | 11 ++++++----- setup.py | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b8d33ac..3b28f70 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,7 @@ LOGGING = { - appname - Your django app ## Release Notes +- 2.0.10 - Not ignoring formatting on exceptions - 2.0.9 - Support extra fields on exceptions too (Thanks @asafc64!) - 2.0.8 - Various PEP8, testings and logging changes (Thanks @nir0s!) - 2.0.7 - Make sure sending thread is alive after fork (Thanks @jo-tham!) diff --git a/logzio/handler.py b/logzio/handler.py index f020453..1be38d4 100644 --- a/logzio/handler.py +++ b/logzio/handler.py @@ -86,12 +86,13 @@ class LogzioHandler(logging.Handler): if message.exc_info: return_json['exception'] = self.format_exception(message.exc_info) + message.exc_info = None # We want to ignore logging format on exceptions, as we handle those differently + + formatted_message = self.format(message) + if isinstance(formatted_message, dict): + return_json.update(formatted_message) else: - formatted_message = self.format(message) - if isinstance(formatted_message, dict): - return_json.update(formatted_message) - else: - return_json['message'] = formatted_message + return_json['message'] = formatted_message return_json.update(self.extra_fields(message)) return return_json diff --git a/setup.py b/setup.py index f07b898..4cd2244 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages setup( name="logzio-python-handler", - version='2.0.9', + version='2.0.10', description="Logging handler to send logs to your Logz.io account with bulk SSL", keywords="logging handler logz.io bulk https", author="roiravhon",