- Expose a single ILogger named "repoze.bfg.debug" as a utility;

    this logger is registered unconditionally and is used by the
    authorization debug machinery.  Applications may also make use of
    it as necessary rather than inventing their own logger, for
    convenience.

4 files changed, 6 insertions, 8 deletions

diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py
index 836d2ad6a..8fcebaf13 100644
--- a/repoze/bfg/registry.py
+++ b/repoze/bfg/registry.py
@@ -58,10 +58,8 @@ def makeRegistry(filename, package, options=None, lock=threading.Lock()):
             options = {}
         settings = Settings(options)
         registry.registerUtility(settings, ISettings)
-        if options.get('debug_authorization'):
-            auth_logger = make_stream_logger('repoze.bfg.authdebug',sys.stderr)
-            registry.registerUtility(auth_logger, ILogger,
-                                     'repoze.bfg.authdebug')
+        debug_logger = make_stream_logger('repoze.bfg.debug', sys.stderr)
+        registry.registerUtility(debug_logger, ILogger, 'repoze.bfg.debug')
         original_getSiteManager.sethook(getSiteManager)
         zope.component.getGlobalSiteManager = registry_manager.get
         zcml_configure(filename, package=package)
diff --git a/repoze/bfg/security.py b/repoze/bfg/security.py
index 9f551419d..f1149cc7a 100644
--- a/repoze/bfg/security.py
+++ b/repoze/bfg/security.py
@@ -104,7 +104,7 @@ class ACLSecurityPolicy(object):
     def permits(self, context, request, permission):
         """ Return ``Allowed`` if the policy permits access,
         ``Denied`` if not."""
-        logger = queryUtility(ILogger, name='repoze.bfg.authdebug')
+        logger = queryUtility(ILogger, name='repoze.bfg.debug')
         principals = self.effective_principals(request)
         for location in lineage(context):
             authorizer = self.authorizer_factory(location, logger)
diff --git a/repoze/bfg/tests/test_registry.py b/repoze/bfg/tests/test_registry.py
index d2e6b4caf..86977e941 100644
--- a/repoze/bfg/tests/test_registry.py
+++ b/repoze/bfg/tests/test_registry.py
@@ -35,8 +35,8 @@ class TestMakeRegistry(unittest.TestCase, PlacelessSetup):
             from repoze.bfg.interfaces import ISettings
             from repoze.bfg.interfaces import ILogger
             settings = getUtility(ISettings)
-            logger = getUtility(ILogger, name='repoze.bfg.authdebug')
-            self.assertEqual(logger.name, 'repoze.bfg.authdebug')
+            logger = getUtility(ILogger, name='repoze.bfg.debug')
+            self.assertEqual(logger.name, 'repoze.bfg.debug')
             self.assertEqual(settings.reload_templates, True)
             self.assertEqual(settings.debug_authorization, True)
         finally:
diff --git a/repoze/bfg/tests/test_security.py b/repoze/bfg/tests/test_security.py
index 4a1511c50..a9a30ee6f 100644
--- a/repoze/bfg/tests/test_security.py
+++ b/repoze/bfg/tests/test_security.py
@@ -223,7 +223,7 @@ class TestACLSecurityPolicy(unittest.TestCase, PlacelessSetup):
         import zope.component
         gsm = zope.component.getGlobalSiteManager()
         from repoze.bfg.interfaces import ILogger
-        gsm.registerUtility(logger, ILogger, name='repoze.bfg.authdebug')
+        gsm.registerUtility(logger, ILogger, name='repoze.bfg.debug')
 
     def setUp(self):
         PlacelessSetup.setUp(self)