~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
process putatives: Fix processing of [<servername> <client>] sections
[hippotat]
/
hippotat
diff --git
a/hippotat
b/hippotat
index
3b25bfd
..
248538e
100755
(executable)
--- a/
hippotat
+++ b/
hippotat
@@
-21,7
+21,7
@@
# along with this program, in the file GPLv3. If not,
# see <http://www.gnu.org/licenses/>.
# along with this program, in the file GPLv3. If not,
# see <http://www.gnu.org/licenses/>.
-
+#@ import sys; sys.path.append('@PYBUILD_INSTALL_DIR@')
from hippotatlib import *
import twisted.web
from hippotatlib import *
import twisted.web
@@
-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()
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]))
if not isinstance(cl.outstanding[req], int):
raise RuntimeError('[%#x] previously %s' %
(id(req), cl.outstanding[req]))
@@
-243,6
+244,8
@@
def process_cfg(_opts, putative_servers, putative_clients):
sections = cfg_process_client_common(c,ss,cs,ci)
if not sections: continue
sections = cfg_process_client_common(c,ss,cs,ci)
if not sections: continue
+ log_debug_config('processing client [%s %s]' % (ss, cs))
+
def srch(getter,key): return cfg_search(getter,key,sections)
c.http_timeout += srch(cfg.getint, 'http_timeout_grace')
def srch(getter,key): return cfg_search(getter,key,sections)
c.http_timeout += srch(cfg.getint, 'http_timeout_grace')
@@
-252,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')
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)
try: c.url = srch(cfg.get,'url')
except NoOptionError:
cfg_process_saddrs(c, ss)