X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=afc792d3fd25ce13910ca455c6c4b178778b6674;hp=6af84cd1fd9c507c2421b7ec4cbdb86b7b10194c;hb=15407d80acf8183a0a56e07590876573fb0c432d;hpb=9b65cdd4ec984631f011e936e1be7cdaff5f4134

diff --git a/client b/client
index 6af84cd..afc792d 100755
--- a/client
+++ b/client
@@ -78,24 +78,28 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
     self._log(DBG.HTTP_CTRL, 'connectionMade')
 
   def connectionLost(self, reason):
-    self._log(DBG.HTTP_CTRL, 'connectionLost')
-    if isinstance(reason, twisted.internet.error.ConnectionDone):
+    self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
+    if reason.check(twisted.web.client.ResponseDone):
       try: self._ssd.flush()
-      except Exception as e: asyncfailure(e)
+      except Exception as e:
+        self._asyncfailure(e)
     else:
       self._asyncfailure(reason)
 
   def _asyncfailure(self, reason):
+    self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
     global outstanding
     outstanding += 1
-    req_err(reason)
+    req_err(self._req, reason)
 
 def req_ok(req, resp):
+  log_debug(DBG.HTTP_CTRL, 'req_ok ' + str(resp), idof=req)
   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)
 
@@ -107,7 +111,7 @@ def req_fin(*args):
 def asyncfailure(reason):
   global outstanding
   outstanding += 1
-  req_err(reason)
+  req_err(None, reason)
 
 def check_outbound():
   global outstanding
@@ -160,7 +164,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()