Improve tracing

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/licensedcode/index.py

@@ -991,7 +991,7 @@ def match_query(
         for matcher, include_low, matcher_name in matchers:
             if TRACE:
                 logger_debug()
-                logger_debug('matching with matcher:', matcher_name)
+                logger_debug('match_query: matching with matcher:', matcher_name)
 
             matched = matcher(
                 qry,
@@ -1019,7 +1019,7 @@ def match_query(
                 ):
                     qry.subtract(m.qspan)
 
-            # Check if we have some matchable left do not match futher if we do
+            # Check if we have some matchable left: do not match futher if we do
             # not need to collect qspans matched exactly e.g. with coverage 100%
             # this coverage check is because we have provision to match
             # fragments (unused for now).
@@ -1028,7 +1028,11 @@ def match_query(
                 m.qspan for m in matched if m.coverage() == 100)
 
             if not whole_query_run.is_matchable(
-                include_low=include_low, qspans=already_matched_qspans):
+                include_low=include_low,
+                qspans=already_matched_qspans,
+            ):
+                if TRACE:
+                    logger_debug('  match_query: no more matchable ... stop matching after matcher:', matcher_name)
                 break
 
             # break if deadline has passed

src/licensedcode/match_seq.py

@@ -24,15 +24,20 @@ def logger_debug(*args): pass
 
 
 if TRACE or TRACE2 or TRACE3:
-    import logging
-
-    logger = logging.getLogger(__name__)
+    use_print = True
+    if use_print:
+        prn = print
+    else:
+        import logging
+        logger = logging.getLogger(__name__)
+        # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
+        logging.basicConfig(stream=sys.stdout)
+        logger.setLevel(logging.DEBUG)
+        prn = logger.debug
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
+        return prn(' '.join(isinstance(a, str) and a or repr(a) for a in args))
 
-    logging.basicConfig(stream=sys.stdout)
-    logger.setLevel(logging.DEBUG)
 
 """
 Matching strategy using pair-wise multiple local sequences alignment and diff-