[CalendarServer-changes] [2543] CalendarServer/trunk/twistedcaldav/log.py

[source_changes at macosforge.org]

Revision: 2543
          http://trac.macosforge.org/projects/calendarserver/changeset/2543
Author:   wsanchez at apple.com
Date:     2008-06-05 15:55:21 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
Get rid of defaultLogLevel variable; use None key instead.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/log.py

Modified: CalendarServer/trunk/twistedcaldav/log.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/log.py	2008-06-05 22:54:17 UTC (rev 2542)
+++ CalendarServer/trunk/twistedcaldav/log.py	2008-06-05 22:55:21 UTC (rev 2543)
@@ -81,10 +81,8 @@
 # Tools for manageing log levels
 ##
 
-defaultLogLevel = "info"
+logLevelsByNamespace = {None: "info"}
 
-logLevelsByNamespace = {}
-
 def logLevelForNamespace(namespace):
     """
     @param namespace: a logging namespace, or C{None} to set the
@@ -92,7 +90,7 @@
     @return: the log level for the given namespace.
     """
     if not namespace:
-        return defaultLogLevel
+        return logLevelsByNamespace[None]
 
     if namespace in logLevelsByNamespace:
         return logLevelsByNamespace[namespace]
@@ -106,7 +104,7 @@
             return logLevelsByNamespace[namespace]
         index -= 1
 
-    return defaultLogLevel
+    return logLevelsByNamespace[None]
 
 def setLogLevelForNamespace(namespace, level):
     """
@@ -117,12 +115,11 @@
     if level not in logLevels:
         raise InvalidLogLevelError(level)
 
-    if not namespace:
-        global defaultLogLevel
-        defaultLogLevel = level
+    if namespace:
+        logLevelsByNamespace[namespace] = level
+    else:
+        logLevelsByNamespace[None] = level
 
-    logLevelsByNamespace[namespace] = level
-
 def clearLogLevels():
     """
     Clears all log levels to the default.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080605/d8439e7c/attachment.htm