X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=64025919900694a2955e97f298c8477cc62176af;hp=467afd60885ce5c50e4ccb5aa751af4307b3834a;hb=3a7aaa41178a5e0aed6c3214414a8f00e26e7177;hpb=4bf8a9a0471ee076329e6a63768c3cc0a4ce1661

diff --git a/client b/client
index 467afd6..6402591 100755
--- a/client
+++ b/client
@@ -68,8 +68,11 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     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)
+    self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
+    try:
+      self._ssd.inputdata(mime_translate(data))
+    except Exception as e:
+      self._asyncfailure(e)
 
   def connectionMade(self):
     self._log(DBG.HTTP_CTRL, 'connectionMade')
@@ -78,16 +81,23 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     self._log(DBG.HTTP_CTRL, 'connectionLost')
     if isinstance(reason, twisted.internet.error.ConnectionDone):
       try: self._ssd.flush()
-      except Exception as e: asyncfailure(e)
+      except Exception as e:
+        self._asyncfailure(e)
     else:
-      asyncfailure(reason)
+      self._asyncfailure(reason)
+
+  def _asyncfailure(self, reason):
+    global outstanding
+    outstanding += 1
+    req_err(self._req, reason)
 
 def req_ok(req, resp):
   rc = ResponseConsumer(req)
   resp.deliverBody(rc)
   req_fin()
 
-def req_err(err):
+def req_err(req, err):
+  log_debug(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
   print(err, file=sys.stderr)
   reactor.callLater(c.http_retry, req_fin)
 
@@ -99,7 +109,7 @@ def req_fin(*args):
 def asyncfailure(reason):
   global outstanding
   outstanding += 1
-  req_err(reason)
+  req_err(None, reason)
 
 def check_outbound():
   global outstanding
@@ -152,7 +162,7 @@ def check_outbound():
                         producer)
     req.addTimeout(c.http_timeout, reactor)
     req.addCallback((lambda resp: req_ok(req, resp)))
-    req.addErrback(req_err)
+    req.addErrback((lambda err: req_err(req, err)))
     outstanding += 1
 
 common_startup()