wip

[hippotat.git] / hippotat / __init__.py

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index ae13eece753bb87b17131c48a32f3173aabe1ef8..c1a6996bb862cb2a50cf08980ca3b35a5f679142 100644 (file)
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -50,7 +50,7 @@ def log_debug(dflag, msg, idof=None, d=None):
   if idof is not None:
     msg = '[%d] %s' % (id(idof), msg)
   if d is not None:
-    #d = d[0:64]
+    d = d[0:64]
     d = _hex_codec(d)[0].decode('ascii')
     msg += ' ' + d
   log.info('{dflag} {msgcore}', dflag=dflag, msgcore=msg)
@@ -164,7 +164,7 @@ class SlipStreamDecoder():
     self._log('__init__')
 
   def _log(self, msg, **kwargs):
-    log_debug(DBG.SLIP_FULL, 'slip '+msg, **kwargs)
+    log_debug(DBG.SLIP_FULL, 'slip %s: %s' % (self._desc, msg), **kwargs)
 
   def inputdata(self, data):
     self._log('inputdata', d=data)
@@ -174,15 +174,15 @@ class SlipStreamDecoder():
     self._buffer = packets.pop()
     for packet in packets:
       self._maybe_packet(packet)
-    self._log('inputdata bufremain', d=self._buffer)
+    self._log('bufremain', d=self._buffer)
 
   def _maybe_packet(self, packet):
-    self._log('inputdata maybepacket', d=packet)
+    self._log('maybepacket', d=packet)
     if len(packet):
       self._on_packet(packet)
 
   def flush(self):
-    self._log('inputdata flush')
+    self._log('flush')
     self._maybe_packet(self._buffer)
     self._buffer = b''