X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=hippotat;h=200cf3a2a4b333ba797c7b4d36719289687209ab;hp=a6ec7aec06405b8315d1120d50e70be83776eeb2;hb=216519e342072164533ae340141d585c638db8e2;hpb=ef04103340f9c2f2666ea3a12bf6420758f2da6d

diff --git a/hippotat b/hippotat
index a6ec7ae..200cf3a 100755
--- a/hippotat
+++ b/hippotat
@@ -30,9 +30,10 @@ import twisted.web.client
 import io
 
 class GeneralResponseConsumer(twisted.internet.protocol.Protocol):
-  def __init__(self, cl, req, desc):
+  def __init__(self, cl, req, resp, desc):
     self._cl = cl
     self._req = req
+    self._resp = resp
     self._desc = desc
 
   def _log(self, dflag, msg, **kwargs):
@@ -41,9 +42,12 @@ class GeneralResponseConsumer(twisted.internet.protocol.Protocol):
   def connectionMade(self):
     self._log(DBG.HTTP_CTRL, 'connectionMade')
 
+  def connectionLostOK(self, reason):
+    return reason.check(twisted.web.client.ResponseDone)
+
 class ResponseConsumer(GeneralResponseConsumer):
-  def __init__(self, cl, req):
-    super().__init__(cl, req, 'RC')
+  def __init__(self, cl, req, resp):
+    super().__init__(cl, req, resp, 'RC')
     ssddesc = '[%s] %s' % (id(req), self._desc)
     self._ssd = SlipStreamDecoder(ssddesc, partial(queue_inbound, cl.ipif))
     self._log(DBG.HTTP_CTRL, '__init__')
@@ -56,9 +60,10 @@ class ResponseConsumer(GeneralResponseConsumer):
       self._handleexception()
 
   def connectionLost(self, reason):
-    self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason))
-    if not reason.check(twisted.web.client.ResponseDone):
-      self.latefailure()
+    reason_msg = 'connectionLost ' + str(reason)
+    self._log(DBG.HTTP_CTRL, reason_msg)
+    if not self.connectionLostOK(reason):
+      self._latefailure(reason_msg)
       return
     try:
       self._log(DBG.HTTP, 'ResponseDone')
@@ -77,8 +82,7 @@ class ResponseConsumer(GeneralResponseConsumer):
 
 class ErrorResponseConsumer(GeneralResponseConsumer):
   def __init__(self, cl, req, resp):
-    super().__init__(cl, req, 'ERROR-RC')
-    self._resp = resp
+    super().__init__(cl, req, resp, 'ERROR-RC')
     self._m = b''
     try:
       self._phrase = resp.phrase.decode('utf-8')
@@ -95,7 +99,7 @@ class ErrorResponseConsumer(GeneralResponseConsumer):
       mbody = self._m.decode('utf-8')
     except Exception:
       mbody = repr(self._m)
-    if not reason.check(twisted.web.client.ResponseDone):
+    if not self.connectionLostOK(reason):
       mbody += ' || ' + str(reason)
     self._cl.req_err(self._req,
             "FAILED %d %s | %s"
@@ -138,7 +142,7 @@ class Client():
             'req_ok %d %s %s' % (resp.code, repr(resp.phrase), str(resp)),
             idof=req)
     if resp.code == 200:
-      rc = ResponseConsumer(cl, req)
+      rc = ResponseConsumer(cl, req, resp)
     else:
       rc = ErrorResponseConsumer(cl, req, resp)
 
@@ -150,6 +154,7 @@ class Client():
     # later, by ResponsConsumer or ErrorResponsConsumer
     try:
       cl.log(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req)
+      cl.running_reported = False
       if isinstance(err, twisted.python.failure.Failure):
         err = err.getTraceback()
       print('%s[%#x] %s' % (cl.desc, id(req), err.strip('\n').replace('\n',' / ')),