Changeset 6399

Timestamp:

17 Jun 2011, 15:06:26 (14 years ago)

Author:

uli

Message:

 

Location:

main/waeup.sirp/trunk/src/waeup/sirp/utils

Files:

• logger.py (modified) (2 diffs)
• tests/test_logger.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/utils/logger.py

@@ -196 +196 @@
         return
 
+    def keys(self):
+        return self._loggers.keys()
+
 class ILogger(Interface):
     """A logger cares for setup, update and restarting of a Python logger.
@@ -304 +307 @@
         self._logger.setLevel(self.options.get('level', logging.DEBUG))
         return self._logger
+
+#: A place where we store seen loggers.
+SiteLoggersRepository = dict()
+
+class SiteLoggersFinder(object):
+    grok.provides(ISiteLoggers)
+
+    def getLoggers(self, site=None):
+        if site is None:
+            site = grok.getSite()
+        if site not in SiteLoggersRepository.keys():
+            SiteLoggersRepository[site] = SiteLoggers()
+        return SiteLoggersRepository[site]
+
+grok.global_utility(SiteLoggersFinder, provides=ISiteLoggers)

main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_logger.py

@@ -26 +26 @@
 import tempfile
 from zope.app.testing.functional import FunctionalTestCase
+from zope.component import queryUtility
 from zope.component.hooks import setSite, clearSite
 from zope.interface.verify import verifyClass, verifyObject
@@ -31 +32 @@
 from waeup.sirp.testing import FunctionalLayer, doctestsuite_for_module
 from waeup.sirp.utils.logger import (
-    ISiteLoggers, ILogger, SiteLoggers, WAeUPLogger)
-
-class FakeDatacenter(object):
-    def __init__(self):
-        self.storage = None
-
-class FakeSite(dict):
-    def __init__(self):
-        super(FakeSite, self).__init__()
-        self.__name__ = None
-        self['datacenter'] = FakeDatacenter()
-
+    ISiteLoggers, ILogger, SiteLoggers, WAeUPLogger, SiteLoggersRepository)
 
 class SiteLoggersTests(FunctionalTestCase):
@@ -61 +51 @@
 
         self.workdir = tempfile.mkdtemp()
+        SiteLoggersRepository.clear()
         return
 
@@ -100 +91 @@
         loggers.unregister('sample')
         self.assertEqual(loggers._loggers, {})
+
+    def test_utility_no_site(self):
+        # make sure we get loggers even if no site is defined/set
+        util = queryUtility(ISiteLoggers)
+        loggers = util.getLoggers()
+        assert util is not None
+        assert loggers is not None
+        assert None in SiteLoggersRepository.keys()
+
+    def test_utility(self):
+        # make sute we get loggers for a certain site
+        setSite(self.app)
+        util = queryUtility(ISiteLoggers)
+        loggers = util.getLoggers()
+        assert util is not None
+        assert loggers is not None
+        assert self.app in SiteLoggersRepository.keys()
+
+    def test_utility_multiple(self):
+        # make sure we get the same loggers for same site
+        setSite(self.app)
+        self.assertEqual(SiteLoggersRepository.keys(), [])
+        util = queryUtility(ISiteLoggers)
+        loggers1 = util.getLoggers()
+        loggers2 = util.getLoggers()
+        assert loggers1 is loggers2
+
+    def test_utility_given_site(self):
+        # make sure a passed site is respected
+        util = queryUtility(ISiteLoggers)
+        loggers = util.getLoggers(site=self.app)
+        assert loggers is not None
+        assert self.app in SiteLoggersRepository.keys()
 
 class LoggerTests(FunctionalTestCase):