wip

[hippotat.git] / client

diff --git a/client b/client
index cda0ac84f01c1ee8fc7d34a3f5ee1d0a30bf4f7f..e3fcd0d8f368936ea5dfaef1d6be3312216189f7 100755 (executable)
--- a/client
+++ b/client
@@ -61,7 +61,7 @@ def outbound(packet, saddr, daddr):
 class ResponseConsumer(twisted.internet.protocol.Protocol):
   def __init__(self, req):
     self._req = req
-    self._ssd = SlipStreamDecoder(queue_inbound)
+    self._ssd = SlipStreamDecoder('req %s' % id(req), queue_inbound)
     self._log(DBG.HTTP_CTRL, '__init__')
 
   def _log(self, dflag, msg, **kwargs):
@@ -72,19 +72,23 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     try:
       self._ssd.inputdata(mime_translate(data))
     except Exception as e:
-      self._asyncfailure(e)
+      self._handleexception()
 
   def connectionMade(self):
     self._log(DBG.HTTP_CTRL, 'connectionMade')
 
   def connectionLost(self, reason):
     self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
-    if reason.check(twisted.web.client.ResponseDone):
-      try: self._ssd.flush()
-      except Exception as e:
-        self._asyncfailure(e)
-    else:
+    if not reason.check(twisted.web.client.ResponseDone):
       self._asyncfailure(reason)
+      return
+    try:
+      self._ssd.flush()
+    except Exception as e:
+      self._handleexception()
+
+  def _handleexception(self):
+    self._asyncfailure(traceback.format_exc())
 
   def _asyncfailure(self, reason):
     self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
@@ -105,16 +109,23 @@ class ErrorResponseConsumer(twisted.internet.protocol.Protocol):
   def _log(self, dflag, msg, **kwargs):
     log_debug(dflag,'ERROR-RC '+msg, idof=self._req, **kwargs)
 
-  def connectionMade(self): self._m = ''
-  def dataReceived(self, data): self._m += data
+  def connectionMade(self):
+    self._m = b''
+
+  def dataReceived(self, data):
+    self._log(DBG.HTTP_CTRL, 'dataReceived ' + repr(data))
+    self._m += data
+
   def connectionLost(self, reason):
     try:
       mbody = self._m.decode('utf-8')
     except Exception:
       mbody = repr(self._m)
-    req_err(req,
-            "FAILED %d %s | %s | %s"
-            % (self._resp.code, self.phrase, mbody, str(reason)))
+    if not reason.check(twisted.web.client.ResponseDone):
+      mbody += ' || ' + str(reason)
+    req_err(self._req,
+            "FAILED %d %s | %s"
+            % (self._resp.code, self._phrase, mbody))
 
 def req_ok(req, resp):
   log_debug(DBG.HTTP_CTRL,
@@ -129,6 +140,8 @@ def req_ok(req, resp):
 
 def req_err(req, err):
   log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
+  if isinstance(err, twisted.python.failure.Failure):
+    err = err.getTraceback()
   print(err, file=sys.stderr)
   reactor.callLater(c.http_retry, (lambda: req_fin(req)))