Changeset 7651

Timestamp:

15 Feb 2012, 08:25:58 (13 years ago)

Author:

Henrik Bettermann

Message:

Add principal name in log messages.

Location:

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

Files:

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

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

@@ -82 +82 @@
 from waeup.sirp.interfaces import (
     IDataCenter, IDataCenterStorageMovedEvent, ILoggerCollector)
+from waeup.sirp.utils.helpers import get_current_principal
 
 #: Default logfile size (5 KB)
@@ -116 +117 @@
         """
 
+class ContextFilter(logging.Filter):
+    """
+    This is a filter which injects contextual information into the log.
+
+    """
+
+    def filter(self, record):
+        user = get_current_principal()
+        record.user = getattr(user, 'id', 'system')
+        return True
+
 class Logger(object):
     """Mixin-class that for logging support.
@@ -169 +181 @@
             dict(sitename='%s' % sitename))
         logger = logging.getLogger(loggername)
+        flt = ContextFilter()
+        logger.addFilter(flt)
         if site is None or sitename is None:
             # Site not added to ZODB yet. Log to commandline
@@ -202 +216 @@
         handler.setLevel(LEVEL)
         formatter = logging.Formatter(
-            '%(asctime)s - %(levelname)s - %(message)s')
+            '%(asctime)s - %(levelname)s - %(user)s - %(message)s')
         handler.setFormatter(formatter)
 

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

@@ -266 +266 @@
         logfile = handler.baseFilename
         content = open(logfile, 'rb').read()
-        self.assertTrue(content.endswith(' - INFO - msg from do_something\n'))
+        self.assertTrue(content.endswith(' - INFO - system - msg from do_something\n'))
         return