[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [2345]
From: source_changes () macosforge ! org
Date: 2008-04-24 22:31:17
Message-ID: 20080424223117.D6E8015DBEB6 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 2345
http://trac.macosforge.org/projects/calendarserver/changeset/2345
Author: wsanchez@apple.com
Date: 2008-04-24 15:31:16 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Add some sorting tools.
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/log.py
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py
Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/log.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/log.py 2008-04-24 \
21:41:09 UTC (rev 2344)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/log.py 2008-04-24 \
22:31:16 UTC (rev 2345) @@ -35,6 +35,9 @@
__all__ = [
"logLevels",
+ "cmpLogLevels",
+ "lowestLogLevel",
+ "highestLogLevel",
"logLevelForNamespace",
"setLogLevelForNamespace",
"clearLogLevels",
@@ -55,6 +58,15 @@
logLevelIndexes = dict(zip(logLevels, xrange(0, len(logLevels))))
+def cmpLogLevels(a, b):
+ return cmp(logLevelIndexes[a], logLevelIndexes[b])
+
+def lowestLogLevel(*levels):
+ return sorted(levels, cmpLogLevels)[0]
+
+def highestLogLevel(*levels):
+ return sorted(levels, cmpLogLevels, reverse=True)[0]
+
##
# Tools for manageing log levels
##
@@ -68,6 +80,9 @@
@param namespace: a logging namespace
@return: the log level for the given namespace.
"""
+ if not namespace:
+ return defaultLogLevel
+
if namespace in logLevelsByNamespace:
return logLevelsByNamespace[namespace]
@@ -89,6 +104,11 @@
@param level: the log level for the given namespace.
"""
assert level in logLevels
+
+ if not namespace:
+ global defaultLogLevel
+ defaultLogLevel = level
+
logLevelsByNamespace[namespace] = level
def clearLogLevels():
@@ -128,7 +148,7 @@
assert level in logLevels
log.msg(
str(message),
- isError = (logLevelIndexes[level] >= logLevelIndexes["error"]),
+ isError = (cmpLogLevels(level, "error") >= 0),
level = level,
namespace = self.namespace,
**kwargs
Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py 2008-04-24 \
21:41:09 UTC (rev 2344)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py 2008-04-24 \
22:31:16 UTC (rev 2345) @@ -36,6 +36,21 @@
pass
class Logging (twisted.trial.unittest.TestCase):
+ def test_cmpLogLevels(self):
+ self.assertEquals(cmpLogLevels("info" , "error"), -1)
+ self.assertEquals(cmpLogLevels("debug", "debug"), 0)
+ self.assertEquals(cmpLogLevels("warn" , "debug"), 1)
+
+ def test_lowestLogLevel(self):
+ self.assertEquals(lowestLogLevel(*logLevels), "debug")
+ self.assertEquals(lowestLogLevel(*reversed(logLevels)), "debug")
+ self.assertEquals(lowestLogLevel("warn", "info"), "info")
+
+ def test_highestLogLevel(self):
+ self.assertEquals(highestLogLevel(*logLevels), "error")
+ self.assertEquals(highestLogLevel(*reversed(logLevels)), "error")
+ self.assertEquals(highestLogLevel("warn", "info"), "warn")
+
def test_namespace_default(self):
"""
Default namespace is module name.
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style \
type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: \
6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; \
padding: 6px; } #msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<title>[2345] CalendarServer/branches/users/wsanchez/logging/twistedcaldav</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/calendarserver/changeset/2345">2345</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2008-04-24 15:31:16 -0700 (Thu, 24 Apr 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add some sorting tools.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserswsanchezloggingtwistedcaldavlogpy">CalendarServer/branches/users/wsanchez/logging/twistedcaldav/log.py</a></li>
<li><a href="#CalendarServerbranchesuserswsanchezloggingtwistedcaldavtesttest_logpy"> \
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserswsanchezloggingtwistedcaldavlogpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/log.py (2344 => \
2345)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/log.py 2008-04-24 \
21:41:09 UTC (rev 2344)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/log.py 2008-04-24 \
22:31:16 UTC (rev 2345) </span><span class="lines">@@ -35,6 +35,9 @@
</span><span class="cx">
</span><span class="cx"> __all__ = [
</span><span class="cx"> "logLevels",
</span><ins>+ "cmpLogLevels",
+ "lowestLogLevel",
+ "highestLogLevel",
</ins><span class="cx"> "logLevelForNamespace",
</span><span class="cx"> "setLogLevelForNamespace",
</span><span class="cx"> "clearLogLevels",
</span><span class="lines">@@ -55,6 +58,15 @@
</span><span class="cx">
</span><span class="cx"> logLevelIndexes = dict(zip(logLevels, xrange(0, \
len(logLevels)))) </span><span class="cx">
</span><ins>+def cmpLogLevels(a, b):
+ return cmp(logLevelIndexes[a], logLevelIndexes[b])
+
+def lowestLogLevel(*levels):
+ return sorted(levels, cmpLogLevels)[0]
+
+def highestLogLevel(*levels):
+ return sorted(levels, cmpLogLevels, reverse=True)[0]
+
</ins><span class="cx"> ##
</span><span class="cx"> # Tools for manageing log levels
</span><span class="cx"> ##
</span><span class="lines">@@ -68,6 +80,9 @@
</span><span class="cx"> @param namespace: a logging namespace
</span><span class="cx"> @return: the log level for the given namespace.
</span><span class="cx"> """
</span><ins>+ if not namespace:
+ return defaultLogLevel
+
</ins><span class="cx"> if namespace in logLevelsByNamespace:
</span><span class="cx"> return logLevelsByNamespace[namespace]
</span><span class="cx">
</span><span class="lines">@@ -89,6 +104,11 @@
</span><span class="cx"> @param level: the log level for the given namespace.
</span><span class="cx"> """
</span><span class="cx"> assert level in logLevels
</span><ins>+
+ if not namespace:
+ global defaultLogLevel
+ defaultLogLevel = level
+
</ins><span class="cx"> logLevelsByNamespace[namespace] = level
</span><span class="cx">
</span><span class="cx"> def clearLogLevels():
</span><span class="lines">@@ -128,7 +148,7 @@
</span><span class="cx"> assert level in logLevels
</span><span class="cx"> log.msg(
</span><span class="cx"> str(message),
</span><del>- isError = (logLevelIndexes[level] >= \
logLevelIndexes["error"]), </del><ins>+ isError = \
(cmpLogLevels(level, "error") >= 0), </ins><span class="cx"> \
level = level, </span><span class="cx"> namespace = self.namespace,
</span><span class="cx"> **kwargs
</span></span></pre></div>
<a id="CalendarServerbranchesuserswsanchezloggingtwistedcaldavtesttest_logpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py (2344 \
=> 2345)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py 2008-04-24 \
21:41:09 UTC (rev 2344)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/test/test_log.py 2008-04-24 \
22:31:16 UTC (rev 2345) </span><span class="lines">@@ -36,6 +36,21 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> class Logging (twisted.trial.unittest.TestCase):
</span><ins>+ def test_cmpLogLevels(self):
+ self.assertEquals(cmpLogLevels("info" , "error"), -1)
+ self.assertEquals(cmpLogLevels("debug", "debug"), 0)
+ self.assertEquals(cmpLogLevels("warn" , "debug"), 1)
+
+ def test_lowestLogLevel(self):
+ self.assertEquals(lowestLogLevel(*logLevels), "debug")
+ self.assertEquals(lowestLogLevel(*reversed(logLevels)), "debug")
+ self.assertEquals(lowestLogLevel("warn", "info"), \
"info") +
+ def test_highestLogLevel(self):
+ self.assertEquals(highestLogLevel(*logLevels), "error")
+ self.assertEquals(highestLogLevel(*reversed(logLevels)), "error")
+ self.assertEquals(highestLogLevel("warn", "info"), \
"warn") +
</ins><span class="cx"> def test_namespace_default(self):
</span><span class="cx"> """
</span><span class="cx"> Default namespace is module name.
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic