chiark / gitweb /
wip, towards target
[hippotat.git] / client
diff --git a/client b/client
index 829087e..e4e5eae 100755 (executable)
--- a/client
+++ b/client
@@ -59,22 +59,37 @@ def outbound(packet, saddr, daddr):
   check_outbound()
 
 class ResponseConsumer(twisted.internet.protocol.Protocol):
-  def __init__(self):
+  def __init__(self, req):
+    self._req = req
     self._ssd = SlipStreamDecoder(queue_inbound)
+    self._log(DBG.HTTP_CTRL, '__init__')
+
+  def _log(self, dflag, msg, **kwargs):
+    log_debug(dflag, 'RC ' + msg, idof=self._req, **kwargs)
 
   def dataReceived(self, data):
     try: self._ssd.inputdata(mime_translate(data))
     except Exception as e: asyncfailure(e)
-  def connectionMade(self): pass
+
+  def connectionMade(self):
+    self._log(DBG.HTTP_CTRL, 'connectionMade')
+
   def connectionLost(self, reason):
+    self._log(DBG.HTTP_CTRL, 'connectionLost')
     if isinstance(reason, twisted.internet.error.ConnectionDone):
       try: self._ssd.flush()
       except Exception as e: asyncfailure(e)
     else:
-      asyncfailure(reason)
+      self._asyncfailure(reason)
+
+  def _asyncfailure(self, reason):
+    global outstanding
+    outstanding += 1
+    req_err(reason)
 
-def req_ok(resp):
-  resp.deliverBody(ResponseConsumer())
+def req_ok(req, resp):
+  rc = ResponseConsumer(req)
+  resp.deliverBody(rc)
   req_fin()
 
 def req_err(err):
@@ -141,7 +156,8 @@ def check_outbound():
                         twisted.web.client.Headers(hh),
                         producer)
     req.addTimeout(c.http_timeout, reactor)
-    req.addCallbacks(req_ok, req_err)
+    req.addCallback((lambda resp: req_ok(req, resp)))
+    req.addErrback(req_err)
     outstanding += 1
 
 common_startup()