X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/f85d143fe449d69d6f611fcd388191a80bdfc415..eb6dcb5af291c1c5457c88979ed4b077a4b28367:/hippotat diff --git a/hippotat b/hippotat index 82e1bee..379a184 100755 --- a/hippotat +++ b/hippotat @@ -21,7 +21,7 @@ # along with this program, in the file GPLv3. If not, # see . - +#@ import sys; sys.path.append('@PYBUILD_INSTALL_DIR@') from hippotatlib import * import twisted.web @@ -233,7 +233,7 @@ class Client(): clients = [ ] -def process_cfg(putative_servers, putative_clients): +def process_cfg(_opts, putative_servers, putative_clients): global clients for ss in putative_servers.values(): @@ -243,6 +243,8 @@ def process_cfg(putative_servers, putative_clients): 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') @@ -252,6 +254,12 @@ def process_cfg(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 + try: c.url = srch(cfg.get,'url') except NoOptionError: cfg_process_saddrs(c, ss)