From 7ce9bda575313b66ca0a5cbcf6d6d30f9546a894 Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Thu, 29 Mar 2012 20:11:20 +0100 Subject: Closes #14436: Convert msg + args to string before pickling. --- Lib/logging/handlers.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 3ff324d..6bbc1f7 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -528,9 +528,16 @@ class SocketHandler(logging.Handler): """ ei = record.exc_info if ei: - dummy = self.format(record) # just to get traceback text into record.exc_text + # just to get traceback text into record.exc_text ... + dummy = self.format(record) record.exc_info = None # to avoid Unpickleable error - s = cPickle.dumps(record.__dict__, 1) + # See issue #14436: If msg or args are objects, they may not be + # available on the receiving end. So we convert the msg % args + # to a string, save it as msg and zap the args. + d = dict(record.__dict__) + d['msg'] = record.getMessage() + d['args'] = None + s = cPickle.dumps(d, 1) if ei: record.exc_info = ei # for next handler slen = struct.pack(">L", len(s)) -- cgit v0.12