Merge lp:~mordred/python-fixtures/agressive-loggers into lp:~python-fixtures/python-fixtures/trunk

[Monty Taylor]

In the case where Logger is instantiated with no arguments, what we want is to grab ALL of the logging that's out there. To that end, iterate through the loggerDict and take over anything that's found there too.

The idea came from the nosetests logcapture plugin after noticing that nose was capturing things that the logger fixture was not.

[Robert Collins (lifeless)]

Could we please get a test that this saves/restores properly?

Also loggers are hierarchical, so we should be able to just replace
everything with a single logger.

[Robert Collins (lifeless)]

ping :)

Unmerged revisions

69. By Monty Taylor on 2013-02-24

Added missing import.

68. By Monty Taylor on 2013-02-23

Expand logic for handling the "grab everything" case.

=== modified file 'lib/fixtures/_fixtures/logger.py'
--- lib/fixtures/_fixtures/logger.py	2012-12-16 12:18:12 +0000
+++ lib/fixtures/_fixtures/logger.py	2013-02-24 18:58:23 +0000
@@ -13,7 +13,7 @@
 # license you chose for the specific language governing permissions and
 # limitations under that license.
 
-from logging import StreamHandler, getLogger, INFO, Formatter
+from logging import StreamHandler, getLogger, INFO, Formatter, Logger
 
 from testtools.compat import _u
 
@@ -48,18 +48,27 @@
 
     def setUp(self):
         super(LogHandler, self).setUp()
-        logger = getLogger(self._name)
+        if self._name:
+            root_logger = getLogger(self._name)
+        else:
+            root_logger = getLogger()
         if self._level:
-            self.addCleanup(logger.setLevel, logger.level)
-            logger.setLevel(self._level)
+            self.addCleanup(root_logger.setLevel, root_logger.level)
+            root_logger.setLevel(self._level)
         if self._nuke_handlers:
-            for handler in reversed(logger.handlers):
-                self.addCleanup(logger.addHandler, handler)
-                logger.removeHandler(handler)
+            for handler in reversed(root_logger.handlers):
+                self.addCleanup(root_logger.addHandler, handler)
+                root_logger.removeHandler(handler)
+            if not self._name:
+                for logger in Logger.manager.loggerDict.values():
+                    if hasattr(logger, "handlers"):
+                        for handler in logger.handlers:
+                            self.addCleanup(logger.addHandler, handler)
+                            logger.removeHandler(handler)
         try:
-            logger.addHandler(self.handler)
+            root_logger.addHandler(self.handler)
         finally:
-            self.addCleanup(logger.removeHandler, self.handler)
+            self.addCleanup(root_logger.removeHandler, self.handler)
 
 
 class FakeLogger(Fixture):