From 30b8955134364738edd8d1aae0f91b8cc3865e39 Mon Sep 17 00:00:00 2001 From: Alexander Turenko Date: Mon, 12 Sep 2016 03:02:29 +0300 Subject: [PATCH] Don't suppress LOG_FILTER messages when --debug passed --- docs/settings.rst | 2 ++ pelican/log.py | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index c1da7db6..6f695f90 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -787,6 +787,8 @@ possible to unintentionally filter out multiple message types with the same template (including messages from future Pelican versions). Proceed with caution. +Note: This option does nothing ``--debug`` is passed. + .. _reading_only_modified_content: diff --git a/pelican/log.py b/pelican/log.py index 907981eb..fe14a29b 100644 --- a/pelican/log.py +++ b/pelican/log.py @@ -112,12 +112,12 @@ class LimitFilter(logging.Filter): else: self._raised_messages.add(message_key) - # ignore LOG_FILTER records - # use .msg and not .getMessage() for string formatting to allow - # filtering by templates - ignore_key = (record.levelno, record.msg) - if ignore_key in self._ignore: - return False + # ignore LOG_FILTER records by templates when "debug" isn't enabled + logger_level = logging.getLogger().getEffectiveLevel() + if logger_level > logging.DEBUG: + ignore_key = (record.levelno, record.msg) + if ignore_key in self._ignore: + return False # check if we went over threshold if group: