~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
process putatives: break out log_ignore
[hippotat]
/
hippotatlib
/
__init__.py
diff --git
a/hippotatlib/__init__.py
b/hippotatlib/__init__.py
index
8e00c15
..
19a6aef
100644
(file)
--- a/
hippotatlib/__init__.py
+++ b/
hippotatlib/__init__.py
@@
-386,9
+386,14
@@
def _cfg_process_putatives():
server_pat = r'[-.0-9A-Za-z]+'
client_pat = r'[.:0-9a-f]+'
server_re = regexp.compile(server_pat)
server_pat = r'[-.0-9A-Za-z]+'
client_pat = r'[.:0-9a-f]+'
server_re = regexp.compile(server_pat)
- serverclient_re = regexp.compile(server_pat + r' ' + client_pat)
+ serverclient_re = regexp.compile(
+ server_pat + r' ' + '(?:' + client_pat + '|LIMIT)')
for cs in cfg.sections():
for cs in cfg.sections():
+ def log_ignore(why):
+ print('warning: ignoring config section [%s] (%s)' % (cs, why),
+ file=sys.stderr)
+
if cs == 'LIMIT' or cs == 'COMMON':
# plan A "[LIMIT]" or "[COMMON]"
continue
if cs == 'LIMIT' or cs == 'COMMON':
# plan A "[LIMIT]" or "[COMMON]"
continue
@@
-416,8
+421,7
@@
def _cfg_process_putatives():
ci = ipaddr(pc)
except AddressValueError:
# plan F "[<some thing we do not understand>]"
ci = ipaddr(pc)
except AddressValueError:
# plan F "[<some thing we do not understand>]"
- # well, we ignore this
- print('warning: ignoring config section %s' % cs, file=sys.stderr)
+ log_ignore('bad-addr')
continue
else: # no AddressValueError
continue
else: # no AddressValueError