Changeset 13776 for main/waeup.kofa/trunk/src

Timestamp:

11 Mar 2016, 11:45:01 (9 years ago)

Author:

Henrik Bettermann

Message:

Do not import deprecated DatedRotatingFileHandler?.

Location:

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

Files:

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

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

@@ -78 +78 @@
 from logging.handlers import WatchedFileHandler
 from string import Template
-from ulif.loghandlers import DatedRotatingFileHandler
 from zope import schema
 from zope.component import queryUtility
@@ -85 +84 @@
     IDataCenter, IDataCenterStorageMovedEvent, ILoggerCollector)
 from waeup.kofa.utils.helpers import get_current_principal
-
-#: Default logfile size (5 KB, not relevant for DatedRotatingFileHandlers)
-MAX_BYTES = 5 * 1024 ** 2
-
-#: Default num of backup files (-1 = indefinite)
-BACKUP_COUNT = -1
 
 #: Default logging level (`logging.INFO`)
@@ -218 +211 @@
         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

@@ -29 +29 @@
 
 from waeup.kofa.utils.logger import (
-    Logger, MAX_BYTES, BACKUP_COUNT, ILoggerCollector, LoggerCollector,
+    Logger, ILoggerCollector, LoggerCollector,
     ILogger)
 
@@ -162 +162 @@
         self.assertEqual(len(result.handlers), 1)
         handler = result.handlers[0]
-        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