wip fixes

[hippotat.git] / client

diff --git a/client b/client
index e9bce7c2370b80d22c85162b75e680b67a33b98e..f26d46b8eff30e177a11c379bd81100249d6ee1e 100755 (executable)
--- a/client
+++ b/client
@@ -14,7 +14,7 @@ class GeneralResponseConsumer(twisted.internet.protocol.Protocol):
     self._desc = desc
 
   def _log(self, dflag, msg, **kwargs):
-    self.cl.log(dflag, '%s: %s' % (self._desc, msg), idof=self._req, **kwargs)
+    self._cl.log(dflag, '%s: %s' % (self._desc, msg), idof=self._req, **kwargs)
 
   def connectionMade(self):
     self._log(DBG.HTTP_CTRL, 'connectionMade')
@@ -42,7 +42,7 @@ class ResponseConsumer(GeneralResponseConsumer):
     try:
       self._log(DBG.HTTP, 'ResponseDone')
       self._ssd.flush()
-      self.cl.req_fin(self._req)
+      self._cl.req_fin(self._req)
     except Exception as e:
       self._handleexception()
     if not self._success_reported:
@@ -54,9 +54,9 @@ class ResponseConsumer(GeneralResponseConsumer):
 
   def _latefailure(self, reason):
     self._log(DBG.HTTP_CTRL, '_latefailure ' + str(reason))
-    self.cl.req_err(self._req, reason)
+    self._cl.req_err(self._req, reason)
 
-class ErrorResponseConsumer(twisted.internet.protocol.Protocol):
+class ErrorResponseConsumer(GeneralResponseConsumer):
   def __init__(self, cl, req, resp):
     super().__init__(cl, req, 'ERROR-RC')
     self._resp = resp
@@ -78,7 +78,7 @@ class ErrorResponseConsumer(twisted.internet.protocol.Protocol):
       mbody = repr(self._m)
     if not reason.check(twisted.web.client.ResponseDone):
       mbody += ' || ' + str(reason)
-    self.cl.req_err(self._req,
+    self._cl.req_err(self._req,
             "FAILED %d %s | %s"
             % (self._resp.code, self._phrase, mbody))