Changeset 6445

Timestamp:

21 Jun 2011, 01:00:45 (14 years ago)

Author:

uli

Message:

• Reorder imports
• Remove outdated stuff
• Fixes.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/logger.py (modified) (5 diffs)

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

@@ -26 +26 @@
 import grok
 import logging
+from zope.interface import Interface, Attribute
 
 marker_ = object()
-
-def setup_logger(loggername, filename, site=marker_, logdir=marker_,
-                 handler=marker_, formatter=marker_, propagate=False,
-                 level=logging.DEBUG):
-    """Create a logger.
-    """
-    if site is marker_:
-        site = grok.getSite()
-    if '%s' in loggername:
-        name = getattr(site, '__name__', 'app')
-        loggername = loggername % (name,)
-    logger = logging.getLogger(loggername)
-    update_logger(logger, filename, site=site, logdir=logdir, handler=handler,
-                  formatter=formatter, propagate=propagate, level=level)
-    return logger, loggername
-
-def update_logger(logger, filename, site=marker_, logdir=marker_,
-                  handler=marker_, formatter=marker_, propagate=False,
-                  level=logging.DEBUG):
-    if site is marker_:
-        site = grok.getSite()
-    if logdir is marker_:
-        logdir = os.path.join(site['datacenter'].storage, 'logs')
-    if not os.path.exists(logdir):
-        os.mkdir(logdir)
-    filename = os.path.join(logdir, filename)
-
-    # Create a rotating file handler logger for datacenter.
-    if handler is marker_:
-        handler = logging.handlers.RotatingFileHandler(
-            filename, maxBytes=5*1024**1, backupCount=5)
-    if formatter is marker_:
-        formatter = logging.Formatter(
-            '%(asctime)s - %(levelname)s - %(message)s')
-    handler.setFormatter(formatter)
-
-    logger.propagate = propagate
-    logger.setLevel(level)
-    logger.addHandler(handler)
-    return logger
-
-def get_logger(loggername, filename, site=marker_, **kw):
-    """Get a logger.
-    """
-    if '%s' in loggername:
-        if site is marker_:
-            site = grok.getSite()
-        loggername = loggername % (
-            getattr(site, '__name__', 'app'))
-    logger = logging.getLogger(loggername)
-    if not logger.handlers:
-        kw.update(dict(site=site))
-        logger, loggername = setup_logger(
-            loggername, filename, **kw)
-    return logger
 
 class WAeUPLogger(object):
@@ -117 +63 @@
         if self.site is marker_:
             self.site = grok.getSite()
-        if '%s' in loggername:
-            name = getattr(site, '__name__', '__app')
-            loggername = loggername % (name,)
-        self.logger = logging.getLogger(loggername)
+        if '%s' in self.loggername:
+            name = getattr(self.site, '__name__', '__app')
+            self.loggername = self.loggername % (name,)
+        self.logger = logging.getLogger(self.loggername)
         self.update()
         return
@@ -128 +74 @@
             self.site = grok.getSite()
         if self.logdir is marker_:
-            self.logdir = os.path.join(site['datacenter'].storage, 'logs')
+            self.logdir = os.path.join(self.site['datacenter'].storage, 'logs')
         if not os.path.exists(self.logdir):
             os.mkdir(self.logdir)
@@ -137 +83 @@
             self.handlers = [logging.handlers.RotatingFileHandler(
                     filename, maxBytes=5*1024**1, backupCount=5)]
-        if formatters is marker_:
-            formatters = [logging.Formatter(
+        if self.formatters is marker_:
+            self.formatters = [logging.Formatter(
                     '%(asctime)s - %(levelname)s - %(message)s')]
 
@@ -150 +96 @@
         return self.logger
 
-
-from zope import schema
-from zope.interface import Interface, Attribute
 
 class ISiteLoggers(Interface):