bpo-31457: Allow for nested LoggerAdapter objects #3551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

ambv merged 1 commit into python:master from ambv:nestedLoggerAdapter

Sep 14, 2017

Lib/logging/__init__.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -1739,6 +1739,27 @@ def hasHandlers(self): @@
             """
             return self.logger.hasHandlers()
+        def _log(self, level, msg, args, exc_info=None, extra=None, stack_info=False):
+            """
+            Low-level log implementation, proxied to allow nested logger adapters.
+            """
+            return self.logger._log(
+                level,
+                msg,
+                args,
+                exc_info=exc_info,
+                extra=extra,
+                stack_info=stack_info,
+            )
+        @property
+        def manager(self):
+            return self.logger.manager
+        @manager.setter
+        def set_manager(self, value):
+            self.logger.manager = value
         def __repr__(self):
             logger = self.logger
             level = getLevelName(logger.getEffectiveLevel())
@@ Expand Down @@

Lib/test/test_logging.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -3986,6 +3986,17 @@ def test_has_handlers(self): @@
             self.assertFalse(self.logger.hasHandlers())
             self.assertFalse(self.adapter.hasHandlers())
+        def test_nested(self):
+            msg = 'Adapters can be nested, yo.'
+            adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None)
+            adapter_adapter.log(logging.CRITICAL, msg, self.recording)
+            self.assertEqual(len(self.recording.records), 1)
+            record = self.recording.records[0]
+            self.assertEqual(record.levelno, logging.CRITICAL)
+            self.assertEqual(record.msg, msg)
+            self.assertEqual(record.args, (self.recording,))
     class LoggerTest(BaseTest):
@@ Expand Down @@

Misc/NEWS.d/next/Library/2017-09-13-13-33-39.bpo-31457.bIVBtI.rst

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		LoggerAdapter objects can now be nested.

Provide feedback