X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/ef04103340f9c2f2666ea3a12bf6420758f2da6d..4224dc197474ed0a2535cdb100193fffaa697d0e:/hippotat diff --git a/hippotat b/hippotat index a6ec7ae..997996d 100755 --- a/hippotat +++ b/hippotat @@ -42,7 +42,7 @@ class GeneralResponseConsumer(twisted.internet.protocol.Protocol): self._log(DBG.HTTP_CTRL, 'connectionMade') class ResponseConsumer(GeneralResponseConsumer): - def __init__(self, cl, req): + def __init__(self, cl, req, resp): super().__init__(cl, req, 'RC') ssddesc = '[%s] %s' % (id(req), self._desc) self._ssd = SlipStreamDecoder(ssddesc, partial(queue_inbound, cl.ipif)) @@ -56,9 +56,10 @@ class ResponseConsumer(GeneralResponseConsumer): self._handleexception() def connectionLost(self, reason): - self._log(DBG.HTTP_CTRL, 'connectionLost ' + str(reason)) + reason_msg = 'connectionLost ' + str(reason) + self._log(DBG.HTTP_CTRL, reason_msg) if not reason.check(twisted.web.client.ResponseDone): - self.latefailure() + self._latefailure(reason_msg) return try: self._log(DBG.HTTP, 'ResponseDone') @@ -138,7 +139,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 +151,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',' / ')),