[CalendarServer-changes] [12627] CalendarServer/trunk/calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 12627
          http://trac.calendarserver.org//changeset/12627
Author:   wsanchez at apple.com
Date:     2014-02-09 18:14:54 -0800 (Sun, 09 Feb 2014)
Log Message:
-----------
Inch forward on logs page

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/logs.py
    CalendarServer/trunk/calendarserver/webadmin/logs.xhtml
    CalendarServer/trunk/calendarserver/webadmin/resource.py

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-09 21:54:32 UTC (rev 12626)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-10 02:14:54 UTC (rev 12627)
@@ -21,9 +21,13 @@
 
 __all__ = [
     "LogsResource",
+    "LogEventsResource",
 ]
 
-# from twisted.web.template import renderer
+from txweb2.stream import MemoryStream
+from txweb2.resource import Resource
+from txweb2.http_headers import MimeType
+from txweb2.http import Response
 
 from .resource import PageElement, TemplateResource
 
@@ -47,10 +51,35 @@
 
 class LogsResource(TemplateResource):
     """
-    Web administration landing page resource.
+    Logs page resource.
     """
 
+    addSlash = True
+
+
+    def __init__(self):
+        TemplateResource.__init__(self, LogsPageElement())
+
+        self.putChild("events", LogEventsResource())
+
+
+
+class LogEventsResource(Resource):
+    """
+    Log event vending resource.
+    """
+
     addSlash = False
 
+
     def __init__(self):
-        TemplateResource.__init__(self, LogsPageElement())
+        Resource.__init__(self)
+
+
+    def render(self, request):
+        response = Response()
+        response.stream = MemoryStream("")
+        response.headers.setHeader(
+            "content-type", MimeType.fromString("text/event-stream")
+        )
+        return response

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.xhtml	2014-02-09 21:54:32 UTC (rev 12626)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.xhtml	2014-02-10 02:14:54 UTC (rev 12627)
@@ -8,7 +8,7 @@
     <script type="text/javascript">
 
       window.onload = function() {
-          var eventSource = new EventSource("log_events");
+          var eventSource = new EventSource("./events");
 
           var accessStatusElement = document.getElementById("access-log-status");
           var accessLogElement = document.getElementById("access-log");

Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/resource.py	2014-02-09 21:54:32 UTC (rev 12626)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py	2014-02-10 02:14:54 UTC (rev 12627)
@@ -805,10 +805,8 @@
 
         response = Response()
         response.stream = MemoryStream(htmlContent)
+        response.headers.setHeader(
+            "content-type", MimeType.fromString("text/html; charset=utf-8")
+        )
 
-        for (header, value) in (
-            ("content-type", MimeType.fromString("text/html; charset=utf-8")),
-        ):
-            response.headers.setHeader(header, value)
-
         returnValue(response)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/ac15d1f7/attachment.html>