Merge pull request #85 from scop/logging

Let logging expand messages on demand

stomp/adapter/multicast.py

@@ -74,7 +74,7 @@ def process_frame(self, f, frame_str):
             receipt_frame = Frame('RECEIPT', {'receipt-id': f.headers['receipt']})
             lines = convert_frame_to_lines(receipt_frame)
             self.send(encode(pack(lines)))
-        log.debug("Received frame: %r, headers=%r, body=%r" % (f.cmd, f.headers, f.body))
+        log.debug("Received frame: %r, headers=%r, body=%r", f.cmd, f.headers, f.body)
 
     def stop(self):
         self.running = False

stomp/listener.py

@@ -250,7 +250,7 @@ def __heartbeat_loop(self):
                     log.debug("Lost connection, unable to send heartbeat")
                 except Exception:
                     _, e, _ = sys.exc_info()
-                    log.debug("Unable to send heartbeat, due to: %s" % e)
+                    log.debug("Unable to send heartbeat, due to: %s", e)
 
             if self.receive_sleep != 0:
                 diff_receive = now - self.received_heartbeat

stomp/test/s11_test.py

@@ -74,7 +74,7 @@ def testheartbeat_timeout(self):
             server.running = False
         except Exception:
             _, e, _ = sys.exc_info()
-            log.error("Error: %s" % e)
+            log.error("Error: %s", e)
         finally:
             server.stop()
 

stomp/test/ss_test.py

@@ -53,7 +53,7 @@ def test_disconnect(self):
                 _, e, _ = sys.exc_info()
                 if e.__class__ == AssertionError:
                     self.fail(str(e))
-                log.debug('stopping conn after expected exception %s' % e)
+                log.debug('stopping conn after expected exception %s', e)
                 # lost connection, now restart the server
                 try:
                     conn.disconnect(receipt=None)