X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/fa63bd9399a07c4b26affb3fc214291331d120b4..1a691ffd16d09f66014e06c80093712babb4c0ac:/hippotat

diff --git a/hippotat b/hippotat
index f9395f2..1625628 100755
--- a/hippotat
+++ b/hippotat
@@ -150,9 +150,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 +186,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 +