chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
config reading: log correct filenames
[hippotat.git]
/
hippotat
diff --git
a/hippotat
b/hippotat
index 3b25bfdc77c6ad56f624ece432c0e40fb7f5529b..379a184cf25b3a6fd1d231e475f137c7d1c13982 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
@@
-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
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
+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')
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)
try: c.url = srch(cfg.get,'url')
except NoOptionError:
cfg_process_saddrs(c, ss)