~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
process putatives: Properly report regexp mismatch ignores
[hippotat]
/
hippotatlib
/
__init__.py
diff --git
a/hippotatlib/__init__.py
b/hippotatlib/__init__.py
index
aa5b06c
..
0f59f0d
100644
(file)
--- a/
hippotatlib/__init__.py
+++ b/
hippotatlib/__init__.py
@@
-390,8
+390,16
@@
def _cfg_process_putatives():
server_pat + r' ' + '(?:' + client_pat + '|LIMIT)')
for cs in cfg.sections():
server_pat + r' ' + '(?:' + client_pat + '|LIMIT)')
for cs in cfg.sections():
+ log_debug_config('putatives: section [%s]...' % (cs))
+
+ def log_ignore(why):
+ log_debug_config('putatives: section [%s] X ignore: %s' % (cs, why))
+ print('warning: ignoring config section [%s] (%s)' % (cs, why),
+ file=sys.stderr)
+
if cs == 'LIMIT' or cs == 'COMMON':
# plan A "[LIMIT]" or "[COMMON]"
if cs == 'LIMIT' or cs == 'COMMON':
# plan A "[LIMIT]" or "[COMMON]"
+ log_debug_config('putatives: section [%s] A ignore' % (cs))
continue
try:
continue
try:
@@
-401,6
+409,7
@@
def _cfg_process_putatives():
if server_re.fullmatch(cs):
# plan C "[<servername>]"
if server_re.fullmatch(cs):
# plan C "[<servername>]"
+ log_debug_config('putatives: section [%s] C <server>' % (cs))
putative(servers, cs, cs)
continue
putative(servers, cs, cs)
continue
@@
-410,25
+419,31
@@
def _cfg_process_putatives():
if pcs == 'LIMIT':
# plan E "[<servername> LIMIT]"
if pcs == 'LIMIT':
# plan E "[<servername> LIMIT]"
+ log_debug_config('putatives: section [%s] E <server> LIMIT' % (cs))
continue
try:
# plan D "[<servername> <client>]" part 2
continue
try:
# plan D "[<servername> <client>]" part 2
- ci = ipaddr(pc)
+ ci = ipaddr(pc
s
)
except AddressValueError:
except AddressValueError:
- # plan F "[<some thing we do not understand>]"
- # well, we ignore this
- print('warning: ignoring config section %s' % cs, file=sys.stderr)
+ # plan F branch 1 "[<some thing we do not understand>]"
+ log_ignore('bad-addr')
continue
else: # no AddressValueError
continue
else: # no AddressValueError
- # plan D "[<servername> <client]" part 3
+ # plan D "[<servername> <client>]" part 3
+ log_debug_config('putatives: section [%s] D <server> <client>'
+ % (cs))
putative(clients, ci, pcs)
putative(servers, pss, pss)
continue
putative(clients, ci, pcs)
putative(servers, pss, pss)
continue
+ else:
+ # plan F branch 2 "[<some thing we do not understand>]"
+ log_ignore('nomatch '+ repr(serverclient_re))
else: # no AddressValueError
# plan B "[<client>" part 2
else: # no AddressValueError
# plan B "[<client>" part 2
+ log_debug_config('putatives: section [%s] B <client>' % (cs))
putative(clients, ci, cs)
continue
putative(clients, ci, cs)
continue