Small changes to decorators.
[python_utils.git] / logging_utils.py
index 0452f6caac8470ab5b442ab3e54318259eafa6fc..7be31e3c7c7d530215538e53922ae2070a70b342 100644 (file)
@@ -15,6 +15,8 @@ import random
 import sys
 from typing import Callable, Iterable, Mapping, Optional
 
+from overrides import overrides
+
 # This module is commonly used by others in here and should avoid
 # taking any unnecessary dependencies back on them.
 import argparse_utils
@@ -36,7 +38,7 @@ cfg.add_argument(
     default='INFO',
     choices=['NOTSET', 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'],
     metavar='LEVEL',
-    help='The level below which to squelch log messages.',
+    help='The global default level below which to squelch log messages; see also --lmodule',
 )
 cfg.add_argument(
     '--logging_format',
@@ -90,6 +92,12 @@ cfg.add_argument(
     default=False,
     help='Should we prepend pid/tid data to all log messages?'
 )
+cfg.add_argument(
+    '--logging_debug_modules',
+    action=argparse_utils.ActionNoYes,
+    default=False,
+    help='Should we prepend module/function data to all log messages?'
+)
 cfg.add_argument(
     '--logging_info_is_print',
     action=argparse_utils.ActionNoYes,
@@ -115,6 +123,17 @@ cfg.add_argument(
     default=False,
     help='When calling print, also log.info automatically.'
 )
+cfg.add_argument(
+    '--lmodule',
+    type=str,
+    metavar='<SCOPE>=<LEVEL>[,<SCOPE>=<LEVEL>...]',
+    help=(
+        'Allows per-scope logging levels which override the global level set with --logging-level.' +
+        'Pass a space separated list of <scope>=<level> where <scope> is one of: module, ' +
+        'module:function, or :function and <level> is a logging level (e.g. INFO, DEBUG...)'
+    )
+)
+
 
 built_in_print = print
 
@@ -181,6 +200,7 @@ class SquelchRepeatedMessagesFilter(logging.Filter):
         self.counters = collections.Counter()
         super().__init__()
 
+    @overrides
     def filter(self, record: logging.LogRecord) -> bool:
         id1 = f'{record.module}:{record.funcName}'
         if id1 not in squelched_logging_counts:
@@ -192,6 +212,84 @@ class SquelchRepeatedMessagesFilter(logging.Filter):
         return count < threshold
 
 
+class DynamicPerScopeLoggingLevelFilter(logging.Filter):
+    """Only interested in seeing logging messages from an allow list of
+    module names or module:function names.  Block others.
+
+    """
+    @staticmethod
+    def level_name_to_level(name: str) -> int:
+        numeric_level = getattr(
+            logging,
+            name,
+            None
+        )
+        if not isinstance(numeric_level, int):
+            raise ValueError('Invalid level: {name}')
+        return numeric_level
+
+    def __init__(
+            self,
+            default_logging_level: int,
+            per_scope_logging_levels: str,
+    ) -> None:
+        super().__init__()
+        self.valid_levels = set(['NOTSET', 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'])
+        self.default_logging_level = default_logging_level
+        self.level_by_scope = {}
+        if per_scope_logging_levels is not None:
+            for chunk in per_scope_logging_levels.split(','):
+                if '=' not in chunk:
+                    print(
+                        f'Malformed lmodule directive: "{chunk}", missing "=".  Ignored.',
+                        file=sys.stderr
+                    )
+                    continue
+                try:
+                    (scope, level) = chunk.split('=')
+                except ValueError:
+                    print(
+                        f'Malformed lmodule directive: "{chunk}".  Ignored.',
+                        file=sys.stderr
+                    )
+                    continue
+                scope = scope.strip()
+                level = level.strip().upper()
+                if level not in self.valid_levels:
+                    print(
+                        f'Malformed lmodule directive: "{chunk}", bad level.  Ignored.',
+                        file=sys.stderr
+                    )
+                    continue
+                self.level_by_scope[scope] = (
+                    DynamicPerScopeLoggingLevelFilter.level_name_to_level(
+                        level
+                    )
+                )
+
+    @overrides
+    def filter(self, record: logging.LogRecord) -> bool:
+        # First try to find a logging level by scope (--lmodule)
+        if len(self.level_by_scope) > 0:
+            min_level = None
+            for scope in (
+                    record.module,
+                    f'{record.module}:{record.funcName}',
+                    f':{record.funcName}'
+            ):
+                level = self.level_by_scope.get(scope, None)
+                if level is not None:
+                    if min_level is None or level < min_level:
+                        min_level = level
+
+            # If we found one, use it instead of the global default level.
+            if min_level is not None:
+                return record.levelno >= min_level
+
+        # Otherwise, use the global logging level (--logging_level)
+        return record.levelno >= self.default_logging_level
+
+
 # A map from function_identifier -> probability of logging (0.0%..100.0%)
 probabilistic_logging_levels: Mapping[str, float] = {}
 
@@ -222,6 +320,7 @@ class ProbabilisticFilter(logging.Filter):
     been tagged with the @logging_utils.probabilistic_logging decorator.
 
     """
+    @overrides
     def filter(self, record: logging.LogRecord) -> bool:
         id1 = f'{record.module}:{record.funcName}'
         if id1 not in probabilistic_logging_levels:
@@ -238,7 +337,8 @@ class OnlyInfoFilter(logging.Filter):
     stdout handler.
 
     """
-    def filter(self, record):
+    @overrides
+    def filter(self, record: logging.LogRecord):
         return record.levelno == logging.INFO
 
 
@@ -249,6 +349,7 @@ class MillisecondAwareFormatter(logging.Formatter):
     """
     converter = datetime.datetime.fromtimestamp
 
+    @overrides
     def formatTime(self, record, datefmt=None):
         ct = MillisecondAwareFormatter.converter(
             record.created, pytz.timezone("US/Pacific")
@@ -271,30 +372,31 @@ def initialize_logging(logger=None) -> logging.Logger:
         return logger
 
     handlers = []
-    numeric_level = getattr(
+
+    # Global default logging level (--logging_level)
+    default_logging_level = getattr(
         logging,
         config.config['logging_level'].upper(),
         None
     )
-    if not isinstance(numeric_level, int):
+    if not isinstance(default_logging_level, int):
         raise ValueError('Invalid level: %s' % config.config['logging_level'])
 
     fmt = config.config['logging_format']
     if config.config['logging_debug_threads']:
         fmt = f'%(process)d.%(thread)d|{fmt}'
+    if config.config['logging_debug_modules']:
+        fmt = f'%(filename)s:%(funcName)s:%(lineno)s|{fmt}'
 
     if config.config['logging_syslog']:
         if sys.platform not in ('win32', 'cygwin'):
             handler = SysLogHandler()
-#            for k, v in encoded_priorities.items():
-#                handler.encodePriority(k, v)
             handler.setFormatter(
                 MillisecondAwareFormatter(
                     fmt=fmt,
                     datefmt=config.config['logging_date_format'],
                 )
             )
-            handler.setLevel(numeric_level)
             handlers.append(handler)
 
     if config.config['logging_filename']:
@@ -303,7 +405,6 @@ def initialize_logging(logger=None) -> logging.Logger:
             maxBytes = config.config['logging_filename_maxsize'],
             backupCount = config.config['logging_filename_count'],
         )
-        handler.setLevel(numeric_level)
         handler.setFormatter(
             MillisecondAwareFormatter(
                 fmt=fmt,
@@ -314,7 +415,6 @@ def initialize_logging(logger=None) -> logging.Logger:
 
     if config.config['logging_console']:
         handler = logging.StreamHandler(sys.stderr)
-        handler.setLevel(numeric_level)
         handler.setFormatter(
             MillisecondAwareFormatter(
                 fmt=fmt,
@@ -342,7 +442,14 @@ def initialize_logging(logger=None) -> logging.Logger:
         for handler in handlers:
             handler.addFilter(ProbabilisticFilter())
 
-    logger.setLevel(numeric_level)
+    for handler in handlers:
+        handler.addFilter(
+            DynamicPerScopeLoggingLevelFilter(
+                default_logging_level,
+                config.config['lmodule'],
+            )
+        )
+    logger.setLevel(0)
     logger.propagate = False
 
     if config.config['logging_captures_prints']:
@@ -393,11 +500,11 @@ class OutputMultiplexer(object):
     class Destination(enum.IntEnum):
         """Bits in the destination_bitv bitvector.  Used to indicate the
         output destination."""
-        LOG_DEBUG = 0x01         # -\
-        LOG_INFO = 0x02          #  |
-        LOG_WARNING = 0x04       #   > Should provide logger to the c'tor.
-        LOG_ERROR = 0x08         #  |
-        LOG_CRITICAL = 0x10      # _/
+        LOG_DEBUG = 0x01         #  ⎫
+        LOG_INFO = 0x02          #  
+        LOG_WARNING = 0x04       #  ⎬ Must provide logger to the c'tor.
+        LOG_ERROR = 0x08         #  
+        LOG_CRITICAL = 0x10      #  ⎭
         FILENAMES = 0x20         # Must provide a filename to the c'tor.
         FILEHANDLES = 0x40       # Must provide a handle to the c'tor.
         HLOG = 0x80