X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/d72f83602e9173940102c718974025e16b873657..4224dc197474ed0a2535cdb100193fffaa697d0e:/hippotat

diff --git a/hippotat b/hippotat
index 379a184..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,9 +151,11 @@ 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('[%#x] %s' % (id(req), err), file=sys.stderr)
+      print('%s[%#x] %s' % (cl.desc, id(req), err.strip('\n').replace('\n',' / ')),
+            file=sys.stderr)
       if not isinstance(cl.outstanding[req], int):
         raise RuntimeError('[%#x] previously %s' %
                            (id(req), cl.outstanding[req]))
@@ -184,13 +187,15 @@ class Client():
 
       d = mime_translate(d)
 
+      token = authtoken_make(cl.c.secret)
+
       crlf = b'\r\n'
       lf   =   b'\n'
       mime = (b'--b'                                        + crlf +
               b'Content-Type: text/plain; charset="utf-8"'  + crlf +
               b'Content-Disposition: form-data; name="m"'   + crlf + crlf +
               str(cl.c.client)            .encode('ascii')  + crlf +
-              cl.c.password                                 + crlf +
+              token                                         + crlf +
               str(cl.c.target_requests_outstanding)
                                           .encode('ascii')  + crlf +
               str(cl.c.http_timeout)      .encode('ascii')  + crlf +
@@ -254,9 +259,6 @@ def process_cfg(_opts, putative_servers, putative_clients):
       c.max_queue_time  = srch(cfg.getint, 'max_queue_time')
       c.vroutes         = srch(cfg.get,    'vroutes')
 
-      def cfg_get_raw(*args, **kwargs):
-        return cfg.get(*args, raw=True, **kwargs)
-
       try: c.ifname     = srch(cfg_get_raw, 'ifname_client')
       except NoOptionError: pass