]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-90195: Unset logger disabled flag when configuring it. (GH-96530)
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 3 Sep 2022 12:38:38 +0000 (13:38 +0100)
committerGitHub <noreply@github.com>
Sat, 3 Sep 2022 12:38:38 +0000 (13:38 +0100)
Lib/logging/config.py
Lib/test/test_logging.py

index 2b9d90c3ed5b79e26c6a4f3fd07f8b5dc25fc6de..7cd16c643e9dadf606de1732b08787808505710c 100644 (file)
@@ -869,6 +869,7 @@ class DictConfigurator(BaseConfigurator):
         """Configure a non-root logger from a dictionary."""
         logger = logging.getLogger(name)
         self.common_logger_config(logger, config, incremental)
+        logger.disabled = False
         propagate = config.get('propagate', None)
         if propagate is not None:
             logger.propagate = propagate
index 0c852fc1eda239cfdf9b1d1e694967710b6cbad6..d70bfd6b09e13d2b95e00fc7e9647634ab56626b 100644 (file)
@@ -3677,6 +3677,35 @@ class ConfigDictTest(BaseTest):
             msg = str(ctx.exception)
             self.assertEqual(msg, "Unable to configure handler 'ah'")
 
+    def test_90195(self):
+        # See gh-90195
+        config = {
+            'version': 1,
+            'disable_existing_loggers': False,
+            'handlers': {
+                'console': {
+                    'level': 'DEBUG',
+                    'class': 'logging.StreamHandler',
+                },
+            },
+            'loggers': {
+                'a': {
+                    'level': 'DEBUG',
+                    'handlers': ['console']
+                }
+            }
+        }
+        logger = logging.getLogger('a')
+        self.assertFalse(logger.disabled)
+        self.apply_config(config)
+        self.assertFalse(logger.disabled)
+        # Should disable all loggers ...
+        self.apply_config({'version': 1})
+        self.assertTrue(logger.disabled)
+        del config['disable_existing_loggers']
+        self.apply_config(config)
+        # Logger should be enabled, since explicitly mentioned
+        self.assertFalse(logger.disabled)
 
 class ManagerTest(BaseTest):
     def test_manager_loggerclass(self):