X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=hippotat;h=379a184cf25b3a6fd1d231e475f137c7d1c13982;hb=02a201e1e706788f355171ff979e1f82ecadfc71;hp=3b25bfdc77c6ad56f624ece432c0e40fb7f5529b;hpb=1cc6968f38db0ade45242e08f9aab1b1db3e43b1;p=hippotat.git diff --git a/hippotat b/hippotat index 3b25bfd..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 @@ -243,6 +243,8 @@ def process_cfg(_opts, 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(_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 + try: c.url = srch(cfg.get,'url') except NoOptionError: cfg_process_saddrs(c, ss)