X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=client;h=c08b5fc9a63bcd80d382fcf82abfeb112b2d2c1f;hb=f7ec639f73a3d6fcd5285507901e353cdb25fc29;hp=2765fa592b8a470b00e8b457245800047fd29a3c;hpb=082d973e167d4f8ee6d05711ebcd8ef2a78edc35;p=hippotat.git

diff --git a/client b/client
index 2765fa5..c08b5fc 100755
--- a/client
+++ b/client
@@ -78,8 +78,8 @@ 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:
         self._asyncfailure(e)
@@ -87,29 +87,28 @@ class ResponseConsumer(twisted.internet.protocol.Protocol):
       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()
+  req_fin(req)
 
-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)
+  reactor.callLater(c.http_retry, (lambda: req_fin(req)))
 
-def req_fin(*args):
+def req_fin(req):
+  log_debug(DBG.HTTP_CTRL, 'req_fin', idof=req)
   global outstanding
   outstanding -= 1
   check_outbound()
 
-def asyncfailure(reason):
-  global outstanding
-  outstanding += 1
-  req_err(reason)
-
 def check_outbound():
   global outstanding
 
@@ -159,9 +158,11 @@ def check_outbound():
                         c.url,
                         twisted.web.client.Headers(hh),
                         producer)
+
+    log_debug(DBG.HTTP_CTRL, 'request', idof=req, d=d)
     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()