process putatives: Introduce dbg()

[hippotat.git] / hippotatlib / __init__.py

diff --git a/hippotatlib/__init__.py b/hippotatlib/__init__.py
index bd5d2c3cf58262989707c279c00691e5a969a29b..9b2c33db0aa2efce154855281cc9c21edd6b4fc1 100644 (file)
--- a/hippotatlib/__init__.py
+++ b/hippotatlib/__init__.py
@@ -390,16 +390,17 @@ 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 dbg(m):
+      log_debug_config('putatives: section [%s] %s' % (cs, m))

 
     def log_ignore(why):
 
     def log_ignore(why):

-      log_debug_config('putatives: section [%s] X ignore: %s' % (cs, why))
+      dbg('X ignore: %s' % (why))

       print('warning: ignoring config section [%s] (%s)' % (cs, why),
             file=sys.stderr)
 
     if cs == 'LIMIT' or cs == 'COMMON':
       # plan A "[LIMIT]" or "[COMMON]"
       print('warning: ignoring config section [%s] (%s)' % (cs, why),
             file=sys.stderr)
 
     if cs == 'LIMIT' or cs == 'COMMON':
       # plan A "[LIMIT]" or "[COMMON]"

-      log_debug_config('putatives: section [%s] A ignore' % (cs))
+      dbg('A ignore')

       continue
 
     try:
       continue
 
     try:


@@ -409,7 +410,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))
+        dbg('C <server>')

         putative(servers, cs, cs)
         continue
 
         putative(servers, cs, cs)
         continue
 


@@ -419,28 +420,30 @@ 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))
+          dbg('E <server> LIMIT')

           continue
 
         try:
           # plan D "[<servername> <client>]" part 2
           continue
 
         try:
           # plan D "[<servername> <client>]" part 2

-          ci = ipaddr(pc)
+          ci = ipaddr(pcs)

         except AddressValueError:
         except AddressValueError:

-          # plan F "[<some thing we do not understand>]"
+          # plan F branch 1 "[<some thing we do not understand>]"

           log_ignore('bad-addr')
           continue
 
         else: # no AddressValueError
           # plan D "[<servername> <client>]" part 3
           log_ignore('bad-addr')
           continue
 
         else: # no AddressValueError
           # plan D "[<servername> <client>]" part 3

-          log_debug_config('putatives: section [%s] D <server> <client>'
-                           % (cs))
+          dbg('D <server> <client>')

           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))
+      dbg('B <client>')

       putative(clients, ci, cs)
       continue
 
       putative(clients, ci, cs)
       continue