From 436a1f289231c5d7276be0fbb427c6d079c24f4e Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Sat, 24 Feb 2018 06:46:33 +0100
Subject: [PATCH] [backend] monkey-patch bytes vs. str problem in msgbus

---
 backend/backend/msgbus.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/msgbus.py b/backend/msgbus.py
index 50e9a73a..958d8071 100644
--- a/backend/msgbus.py
+++ b/backend/msgbus.py
@@ -237,6 +237,13 @@ class MsgBusFedmsg(MsgBus):
         }
         content.update(kwargs)
 
+        self.log.info("Preprocessing message content: {}".format(content))
+        for key, val in content.items():
+            if isinstance(val, bytes):
+                self.log.warning("{} for key {} is of type bytes. Converting."
+                                 .format(val, key))
+                content[key] = val.decode('utf-8')
+
         if topic in self.messages:
             for key in self.messages[topic]:
                 content[key] = self.messages[topic][key].format(**content)
@@ -244,4 +251,5 @@ class MsgBusFedmsg(MsgBus):
         self.send(topic, content)
 
     def _send(self, topic, content, headers):
+        self.log.info("Sending content: {}".format(content))
         fedmsg.publish(modname='copr', topic=topic, msg=content)
-- 
2.14.3