[CalendarServer-changes] [12652] CalendarServer/trunk/calendarserver/webadmin/logs.xhtml

[source_changes at macosforge.org]

Revision: 12652
          http://trac.calendarserver.org//changeset/12652
Author:   wsanchez at apple.com
Date:     2014-02-11 11:03:36 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
Wire up server log also

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

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.xhtml	2014-02-11 18:54:14 UTC (rev 12651)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.xhtml	2014-02-11 19:03:36 UTC (rev 12652)
@@ -8,45 +8,56 @@
     <script type="text/javascript">
 
       window.onload = function() {
-        var eventSource = new EventSource("./events");
+        var registerForEvents = function(eventSource, eventClass, statusElement, logViewElement) {
+          statusElement.innerHTML = "Connecting...";
 
-        var accessStatusElement = document.getElementById("access-log-status");
-        var accessLogElement = document.getElementById("access-log");
+          eventSource.addEventListener(
+            "open",
+            function(e) {
+              statusElement.innerHTML = "Connected.";
+            },
+            false
+          );
 
-        accessStatusElement.innerHTML = "Connecting...";
+          eventSource.addEventListener(
+            "error",
+            function(e) {
+              if (e.readyState == EventSource.CLOSED) {
+                statusElement.innerHTML = "Conneciton closed.";
+              }
+              else {
+                statusElement.innerHTML = "Polling...";
+              }
+            },
+            false
+          );
 
-        eventSource.addEventListener(
-          "open",
-          function(e) {
-            accessStatusElement.innerHTML = "Connected.";
-          },
-          false
-        );
+          eventSource.addEventListener(
+            eventClass,
+            function(e) {
+              // Append text
+              logViewElement.innerHTML += event.data + "<br />";
 
-        eventSource.addEventListener(
-          "error",
-          function(e) {
-            if (e.readyState == EventSource.CLOSED) {
-              accessStatusElement.innerHTML = "Conneciton closed.";
-            }
-            else {
-              accessStatusElement.innerHTML = "Polling...";
-            }
-          },
-          false
-        );
+              // Scroll to bottom
+              logViewElement.scrollTop = logViewElement.scrollHeight;
+            },
+            false
+          );
+        }
 
-        eventSource.addEventListener(
-          "access",
-          function(e) {
-            // Append text
-            accessLogElement.innerHTML += event.data + "<br />";
+        var eventSource = new EventSource("./events");
 
-            // Scroll to bottom
-            accessLogElement.scrollTop = accessLogElement.scrollHeight;
-          },
-          false
+        registerForEvents(
+          eventSource, "access",
+          document.getElementById("access-log-status"),
+          document.getElementById("access-log")
         );
+
+        registerForEvents(
+          eventSource, "server",
+          document.getElementById("server-log-status"),
+          document.getElementById("server-log")
+        );
       }
 
     </script>
@@ -54,7 +65,7 @@
     <style>
       .log {
         width: 100%;
-        height: 150pt;
+        height: 200pt;
 
         overflow: scroll;
         white-space: nowrap;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/2dfe41f8/attachment.html>