[CalendarServer-changes] [12871] CalendarServer/trunk/calendarserver/webadmin
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 10 16:26:03 PDT 2014
Revision: 12871
http://trac.calendarserver.org//changeset/12871
Author: wsanchez at apple.com
Date: 2014-03-10 16:26:03 -0700 (Mon, 10 Mar 2014)
Log Message:
-----------
Show log levels
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/webadmin/config.py
CalendarServer/trunk/calendarserver/webadmin/config.xhtml
Modified: CalendarServer/trunk/calendarserver/webadmin/config.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/config.py 2014-03-10 22:58:24 UTC (rev 12870)
+++ CalendarServer/trunk/calendarserver/webadmin/config.py 2014-03-10 23:26:03 UTC (rev 12871)
@@ -25,6 +25,8 @@
from twisted.web.template import renderer, tags as html
+from twext.python.log import Logger
+
from .resource import PageElement, TemplateResource
@@ -107,12 +109,24 @@
def log_level_row(self, request, tag):
def rowsForNamespaces(namespaces):
for namespace in namespaces:
+ if namespace is None:
+ name = u"(default)"
+ else:
+ name = html.code(namespace)
+
+ value = html.code(
+ Logger.publisher.levels.logLevelForNamespace(
+ namespace
+ ).name
+ )
+
yield tag.clone().fillSlots(
- log_level_name="** name **",
- log_level_value="** value **",
+ log_level_name=name,
+ log_level_value=value,
)
- namespaces = ()
+ # FIXME: Using private attributes is bad.
+ namespaces = Logger.publisher.levels._logLevelsByNamespace.keys()
return rowsForNamespaces(namespaces)
Modified: CalendarServer/trunk/calendarserver/webadmin/config.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/config.xhtml 2014-03-10 22:58:24 UTC (rev 12870)
+++ CalendarServer/trunk/calendarserver/webadmin/config.xhtml 2014-03-10 23:26:03 UTC (rev 12871)
@@ -201,7 +201,7 @@
</table>
- <h2>Logging</h2>
+ <h2>Log Levels</h2>
<table>
<caption />
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140310/29c0f5fe/attachment-0001.html>
More information about the calendarserver-changes
mailing list