event/msg: Pass formatted exceptions

PATCH New Richard Purdie 1 participant 1 message May 12, 2016

Share & tools

Richard Purdie

author

2016-05-12 09:56 UTC #0 lore raw

PATCH 1/1 event/msg: Pass formatted exceptions

python3 can't cope with the previous approach we were using to pass exceptions through the RPC. Avoid this by creating a formatted exception on the sender side.

Signed-off-by Richard Purdie <[email protected]>

lib/bb/event.py +2 -1

index 3955f9d..6fb3712 100644
@@ -607,8 +607,9 @@ class LogHandler(logging.Handler):
             if hasattr(tb, 'tb_next'):
                 tb = list(bb.exceptions.extract_traceback(tb, context=3))
             # Need to turn the value into something the logging system can pickle
-            value = str(value)
             record.bb_exc_info = (etype, value, tb)
+            record.bb_exc_formatted = bb.exceptions.format_exception(etype, value, tb, limit=5)
+            value = str(value)
             record.exc_info = None
         fire(record, None)

lib/bb/msg.py +3 -2

index e3ced27..8c3ab47 100644
@@ -90,8 +90,9 @@ class BBLogFormatter(logging.Formatter):
             if self.color_enabled:
                 record = self.colorize(record)
             msg = logging.Formatter.format(self, record)
-
-        if hasattr(record, 'bb_exc_info'):
+        if hasattr(record, 'bb_exc_formatted'):
+            msg += '\n' + ''.join(record.bb_exc_formatted)
+        elif hasattr(record, 'bb_exc_info'):
             etype, value, tb = record.bb_exc_info
             formatted = bb.exceptions.format_exception(etype, value, tb, limit=5)
             msg += '\n' + ''.join(formatted)