Changeset 6578 for main/waeup.sirp/trunk/src/waeup/sirp/applicants

Timestamp:

6 Aug 2011, 11:11:41 (13 years ago)

Author:

uli

Message:

Implement a new logging technique and use it.
Details are explained in waeup.sirp.utils.logger.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• root.py (modified) (2 diffs)
• tests/test_root.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py

@@ -27 +27 @@
 from hurry.query.interfaces import IQuery
 from zope.component import getUtility
-from waeup.sirp.interfaces import IWAeUPSIRPPluggable, ISiteLoggers
+from waeup.sirp.interfaces import IWAeUPSIRPPluggable
 from waeup.sirp.applicants.interfaces import IApplicantsRoot
 from waeup.sirp.utils.helpers import get_current_principal
+from waeup.sirp.utils.logger import Logger
 
-class ApplicantsRoot(grok.Container):
+class ApplicantsRoot(grok.Container, Logger):
     """The root of applicants-related components. It contains only
     containers for applicants.
@@ -39 +40 @@
     local_roles = ['waeup.ApplicationsOfficer']
 
-    @property
-    def logger(self):
-        """Get a logger for applicants.
-        """
-        loggers = getUtility(ISiteLoggers).getLoggers()
-        if 'waeup.sirp.%s.applicants' not in loggers.keys():
-            loggers.register('waeup.sirp.%s.applicants')
-        return loggers.getLogger('waeup.sirp.%s.applicants')
+    logger_name = 'waeup.sirp.${sitename}.applicants'
+    logger_filename = 'applicants.log'
 
     def logger_info(self, target, ob_class, comment=None):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_root.py

@@ -28 +28 @@
 import unittest
 from StringIO import StringIO
-from zope.app.testing.functional import FunctionalTestCase
-from zope.component.hooks import setSite, clearSite
+from zope.component.hooks import setSite
 from zope.interface.verify import verifyClass, verifyObject
-from zope.site import LocalSiteManager
 from waeup.sirp.app import University
 from waeup.sirp.applicants import (
@@ -40 +38 @@
     ApplicantsRoot, ApplicantsPlugin,
     )
-from waeup.sirp.testing import FunctionalLayer
+from waeup.sirp.testing import (
+    FunctionalLayer, FunctionalTestCase, get_all_loggers, remove_new_loggers,
+    remove_logger)
 
 
@@ -54 +54 @@
     def setUp(self):
         super(ApplicantsRootTestCase, self).setUp()
-
+        remove_logger('waeup.sirp.app.applicants')
+        self.old_loggers = get_all_loggers()
         # Setup a sample site for each test
+
+        # Prepopulate the ZODB...
         app = University()
-        self.dc_root = tempfile.mkdtemp()
-        app['datacenter'].setStoragePath(self.dc_root)
-
-        # Prepopulate the ZODB...
         self.getRootFolder()['app'] = app
         self.app = self.getRootFolder()['app']
         setSite(self.app)
+
+        self.dc_root = tempfile.mkdtemp()
+        app['datacenter'].setStoragePath(self.dc_root)
+
         return
 
     def tearDown(self):
         super(ApplicantsRootTestCase, self).tearDown()
+        remove_new_loggers(self.old_loggers)
         shutil.rmtree(self.dc_root)
         return