summaryrefslogtreecommitdiff
path: root/Lib/logging
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2015-12-26 12:48:44 +0000
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2015-12-26 12:48:44 +0000
commit9cdfd18fc6357f1fe343e815196cbe1db2a17af5 (patch)
tree05bd75a0e1465916760c92846658043529bb43dd /Lib/logging
parentf81be8aa3ff3cbae66686482219bd7c7561f3de8 (diff)
downloadcpython-git-9cdfd18fc6357f1fe343e815196cbe1db2a17af5.tar.gz
Closes #25685: Made SocketHandler emission more efficient.
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/handlers.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index b810fa9c58..c6840c30b3 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -588,6 +588,8 @@ class SocketHandler(logging.Handler):
d['msg'] = record.getMessage()
d['args'] = None
d['exc_info'] = None
+ # Issue #25685: delete 'message' if present: redundant with 'msg'
+ d.pop('message', None)
s = pickle.dumps(d, 1)
slen = struct.pack(">L", len(s))
return slen + s