Changeset 1772 for ZMS

Timestamp:

15.12.2011 22:13:20 (5 months ago)

Author:

zmsdev

Message:

applied minor performance-fixes (5): zms_log

Location:

ZMS/trunk

Files:

• _globals.py (modified) (5 diffs)
• zmslog.py (modified) (5 diffs)

ZMS/trunk/_globals.py

@@ -610 +610 @@
 """
 
-LOG = logging.getLogger("ZMS")
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 _globals.debug:
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 def debug(self):
-  has_zms_log = False
+  b = False
   try:
-    zms_log = getattr( self, 'zms_log', None)
-    has_zms_log = \
-      zms_log is not None and \
-      zms_log.meta_type == 'ZMS Log' and \
-      'DEBUG' in zms_log.logged_entries
+    zms_log = self.zms_log
+    severity = logging.DEBUG
+    b = zms_log.hasSeverity(severity)
   except:
     pass
-  return has_zms_log
+  return b
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -632 +628 @@
 def writeLog(self, info):
   try:
-    LOG.debug(info)
-    zms_log = getattr( self, 'zms_log', None)
-    if 'DEBUG' in zms_log.logged_entries:
-      severity = logging.DEBUG
+    zms_log = self.zms_log
+    severity = logging.DEBUG
+    if zms_log.hasSeverity(severity):
       info = "[%s@%s]"%(self.meta_id,self.absolute_url()[len(self.REQUEST['SERVER_URL']):]) + info
       zms_log.LOG( severity, info)
@@ -646 +641 @@
 def writeBlock(self, info):
   try:
-    LOG.info(info)
-    zms_log = getattr( self, 'zms_log', None)
-    if 'INFO' in zms_log.logged_entries:
-      severity = logging.INFO
+    zms_log = self.zms_log
+    severity = logging.INFO
+    if zms_log.hasSeverity(severity):
       info = "[%s@%s]"%(self.meta_id,self.absolute_url()[len(self.REQUEST['SERVER_URL']):]) + info
       zms_log.LOG( severity, info)
@@ -660 +654 @@
 def writeError(self, info):
   try:
-    LOG.error(info)
     t,v,tb = sys.exc_info()
     v = str(v)
@@ -671 +664 @@
     info += ''.join(format_exception(t, v, tb))
     info = "[%s@%s]"%(self.meta_id,self.absolute_url()[len(self.REQUEST['SERVER_URL']):]) + info
-    zms_log = getattr( self, 'zms_log', None)
-    if 'ERROR' in zms_log.logged_entries:
+    zms_log = self.zms_log
+    if zms_log.hasSeverity(severity):
       zms_log.LOG( severity, info)
   except:

ZMS/trunk/zmslog.py

@@ -19 +19 @@
 # Imports.
 from App.special_dtml import HTMLFile
+import copy
 import logging
 import os
@@ -29 +30 @@
 
 def severity_string(severity, mapping={
-    -300: 'TRACE',
-    -200: 'DEBUG',
-    -100: 'BLATHER',
-       0: 'INFO',
-     100: 'PROBLEM',
-     200: 'ERROR',
-     300: 'PANIC',
+    logging.DEBUG:   'DEBUG',
+    logging.INFO:    'INFO',
+    logging.ERROR:   'ERROR',
     }):
     """Convert a severity code to a string."""
-    s = mapping.get(int(severity), '')
-    return "%s(%s)" % (s, severity)
+    return mapping.get(int(severity), '')
 
 
@@ -71 +67 @@
     manage_remote = HTMLFile( 'dtml/ZMSLog/manage_remote', globals())
 
+    LOGGER = logging.getLogger("ZMS")
 
     ############################################################################
@@ -112 +109 @@
 
     # --------------------------------------------------------------------------
+    #  ZMSLog.hasSeverity:
+    # --------------------------------------------------------------------------
+    def hasSeverity(self, severity):
+      return severity_string(severity) in self.logged_entries
+
+    # --------------------------------------------------------------------------
     #  ZMSLog.LOG:
     # --------------------------------------------------------------------------
@@ -117 +120 @@
       while len( self.entries) > self.keep_entries:
         self.entries.remove( self.entries[-1])
-      self.entries.insert( 0 ,log_time() + ' ' + severity_string( severity) + '\n' + info)
+      self.entries.insert( 0 ,log_time() + ' ' + '%s(%i)'%(severity_string(severity),int(severity)) + '\n' + info)
+      self.entries = copy.copy(self.entries)
       if getattr( self, 'copy_to_zlog', True):
-        logging.log( severity, info)
+        self.LOGGER.log( severity, info)
       if getattr( self, 'copy_to_stdout', True):
-        print log_time(), severity_string( severity), info
+        print log_time(), '%s(%i)'%(severity_string(severity),int(severity)), info
 
     ############################################################################