X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/8c771381ce4cfa26901412997c266457b05921d4..b8c38e6610bd82820e028e8b38e6275bb032bee1:/hippotat diff --git a/hippotat b/hippotat index 18cd14e..248538e 100755 --- a/hippotat +++ b/hippotat @@ -152,7 +152,8 @@ class Client(): cl.log(DBG.HTTP_CTRL, 'req_err ' + str(err), idof=req) 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])) @@ -254,6 +255,9 @@ def process_cfg(_opts, putative_servers, putative_clients): c.max_queue_time = srch(cfg.getint, 'max_queue_time') c.vroutes = srch(cfg.get, 'vroutes') + try: c.ifname = srch(cfg_get_raw, 'ifname_client') + except NoOptionError: pass + try: c.url = srch(cfg.get,'url') except NoOptionError: cfg_process_saddrs(c, ss)