summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorCheryl Sabella <cheryl.sabella@gmail.com>2018-09-25 23:00:08 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2018-09-25 23:00:08 (GMT)
commitd345bb4d9b6e16c681cd8a4e1fff94ecd6b0bb09 (patch)
tree270c58e201787cd118f29c2650cd6dfa605f27e3 /Lib/logging
parentfad6af2744c0b022568f7f4a8afc93fed056d4db (diff)
downloadcpython-d345bb4d9b6e16c681cd8a4e1fff94ecd6b0bb09.zip
cpython-d345bb4d9b6e16c681cd8a4e1fff94ecd6b0bb09.tar.gz
cpython-d345bb4d9b6e16c681cd8a4e1fff94ecd6b0bb09.tar.bz2
bpo-34334: Don't log traceback twice in QueueHandler (GH-9537)
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/handlers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 974c089..e213e43 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1374,13 +1374,14 @@ class QueueHandler(logging.Handler):
# (if there's exception data), and also returns the formatted
# message. We can then use this to replace the original
# msg + args, as these might be unpickleable. We also zap the
- # exc_info attribute, as it's no longer needed and, if not None,
- # will typically not be pickleable.
+ # exc_info and exc_text attributes, as they are no longer
+ # needed and, if not None, will typically not be pickleable.
msg = self.format(record)
record.message = msg
record.msg = msg
record.args = None
record.exc_info = None
+ record.exc_text = None
return record
def emit(self, record):