Changeset 9988 for main

Timestamp:

24 Feb 2013, 13:42:04 (12 years ago)

Author:

uli

Message:

Use WatchedFileHandler? instead of DatedRotatingFileHandler? for logging.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/utils

Files:

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

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

@@ -76 +76 @@
 import grok
 import logging
+from logging.handlers import WatchedFileHandler
 from string import Template
 from ulif.loghandlers import DatedRotatingFileHandler
@@ -215 +216 @@
 
         # Create a rotating file handler logger.
-        handler = DatedRotatingFileHandler(
-            filename, when='MON', backupCount=BACKUP_COUNT)
+        handler = WatchedFileHandler(
+            filename, encoding='utf-8')
+        #handler = DatedRotatingFileHandler(
+        #    filename, when='MON', backupCount=BACKUP_COUNT)
         handler.setLevel(LEVEL)
         formatter = logging.Formatter(self.logger_format_str)

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

@@ -162 +162 @@
         self.assertEqual(len(result.handlers), 1)
         handler = result.handlers[0]
-        #self.assertEqual(handler.maxBytes, MAX_BYTES)
-        self.assertEqual(handler.backupCount, BACKUP_COUNT)
+        if hasattr(handler, 'maxBytes'):
+            self.assertEqual(handler.maxBytes, MAX_BYTES)
+        if hasattr(handler, 'backupCount'):
+            self.assertEqual(handler.backupCount, BACKUP_COUNT)
         self.assertTrue(result.propagate is False)
         return
@@ -209 +211 @@
         self.assertEqual(new_handler_num, 1)
         self.assertTrue(isinstance(
-                new_py_logger.handlers[0],
-                logging.handlers.RotatingFileHandler))
+            new_py_logger.handlers[0],
+            logging.handlers.WatchedFileHandler))
 
 class LoggersFunctionalTests(FunctionalTestCase):
@@ -254 +256 @@
         handler = self.component.logger.handlers[0]
         self.assertTrue(isinstance(
-                handler, logging.handlers.RotatingFileHandler))
-        #self.assertEqual(handler.maxBytes, MAX_BYTES)
-        self.assertEqual(handler.backupCount, BACKUP_COUNT)
+                handler, logging.handlers.WatchedFileHandler))
+        if hasattr(handler, 'maxBytes'):
+            self.assertEqual(handler.maxBytes, MAX_BYTES)
+        if hasattr(handler, 'backupCount'):
+            self.assertEqual(handler.backupCount, BACKUP_COUNT)
         self.assertTrue(handler.baseFilename.endswith('logs/sample.log'))
         return