Merge c313373 into f3c453a

moccu · Jun 26, 2014 · f9fded6 · f9fded6
2 parents f3c453a + c313373
commit f9fded6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/omnibus/connection.py b/omnibus/connection.py
@@ -115,7 +115,7 @@ def send(self, msg):
         """
         `send` is used to deliver messages and command responses to client/browser.
         """
-        self.log('debug', u'OUT: {0}'.format(msg))
+        self.log('debug', u'OUT: {0}'.format(msg.decode('utf-8')))
         return super(MessageConnection, self).send(msg)
 
     def respond_command(self, command, success, payload=None):

diff --git a/omnibus/pubsub.py b/omnibus/pubsub.py
@@ -72,7 +72,7 @@ def send(self, msg):
         the default one.
         """
         try:
-            self.log('debug', 'send {0} to {1}'.format(msg, PUBLISHER_ADDRESS))
+            self.log('debug', u'send {0} to {1}'.format(msg, PUBLISHER_ADDRESS))
             publisher = self.get_connection(zmq.PUB, PUBLISHER_ADDRESS)
             publisher.send_unicode(msg)
         except ZMQError as e:
@@ -95,7 +95,7 @@ def publish(self, channel, payload_type, payload=None, sender=None):
         try:
             self.log(
                 'debug',
-                'publish to {0} (payload_type:{1}, payload:{2}, sender:{3})'.format(
+                u'publish to {0} (payload_type:{1}, payload:{2}, sender:{3})'.format(
                     channel, payload_type, payload, sender))
 
             return self.send(u'{0}:{1}'.format(