X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=hippotat%2F__init__.py;h=3e8649ae1e122f7b4252ad4dbc4453e54ffca673;hb=e8ed0029ef6388f2c9af9467f3958bdd145b2f9b;hp=ae13eece753bb87b17131c48a32f3173aabe1ef8;hpb=db6ba5840b00c61fe6e576b54179ddeb30202b0e;p=hippotat.git

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index ae13eec..3e8649a 100644
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -40,6 +40,7 @@ class DBG(twisted.python.constants.Names):
   QUEUE_CTRL = NamedConstant()
   HTTP_FULL = NamedConstant()
   SLIP_FULL = NamedConstant()
+  CTRL_DUMP = NamedConstant()
 
 _hex_codec = codecs.getencoder('hex_codec')
 
@@ -48,9 +49,9 @@ log = twisted.logger.Logger()
 def log_debug(dflag, msg, idof=None, d=None):
   #print('---------------->',repr((dflag, msg, idof, d)), file=sys.stderr)
   if idof is not None:
-    msg = '[%d] %s' % (id(idof), msg)
+    msg = '[%#x] %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 +165,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 +175,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''
 
@@ -285,7 +286,8 @@ _crashing = False
 def crash(err):
   global _crashing
   _crashing = True
-  print('CRASH ', err, file=sys.stderr)
+  print('========== CRASH ==========', err,
+        '===========================', file=sys.stderr)
   try: reactor.stop()
   except twisted.internet.error.ReactorNotRunning: pass