From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 12 May 2016 07:05:32 +0000 (+0100)
Subject: event/msg: Pass formatted exceptions
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7db75020ed727677afbad07a90fb3eac0bf2c45;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/event.py b/lib/bb/event.py
index 5a03a31f436..29b14f6c325 100644
--- a/lib/bb/event.py
+++ b/lib/bb/event.py
@@ -610,8 +610,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)
 
diff --git a/lib/bb/msg.py b/lib/bb/msg.py
index 786b5aef400..6fdd1f52a08 100644
--- a/lib/bb/msg.py
+++ b/lib/bb/msg.py
@@ -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)