<!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" />
<title>[12652] CalendarServer/trunk/calendarserver/webadmin/logs.xhtml</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12652">12652</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 11:03:36 -0800 (Tue, 11 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Wire up server log also</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminlogsxhtml">CalendarServer/trunk/calendarserver/webadmin/logs.xhtml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminlogsxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/logs.xhtml (12651 => 12652)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,45 +8,56 @@
</span><span class="cx">     &lt;script type=&quot;text/javascript&quot;&gt;
</span><span class="cx"> 
</span><span class="cx">       window.onload = function() {
</span><del>-        var eventSource = new EventSource(&quot;./events&quot;);
</del><ins>+        var registerForEvents = function(eventSource, eventClass, statusElement, logViewElement) {
+          statusElement.innerHTML = &quot;Connecting...&quot;;
</ins><span class="cx"> 
</span><del>-        var accessStatusElement = document.getElementById(&quot;access-log-status&quot;);
-        var accessLogElement = document.getElementById(&quot;access-log&quot;);
</del><ins>+          eventSource.addEventListener(
+            &quot;open&quot;,
+            function(e) {
+              statusElement.innerHTML = &quot;Connected.&quot;;
+            },
+            false
+          );
</ins><span class="cx"> 
</span><del>-        accessStatusElement.innerHTML = &quot;Connecting...&quot;;
</del><ins>+          eventSource.addEventListener(
+            &quot;error&quot;,
+            function(e) {
+              if (e.readyState == EventSource.CLOSED) {
+                statusElement.innerHTML = &quot;Conneciton closed.&quot;;
+              }
+              else {
+                statusElement.innerHTML = &quot;Polling...&quot;;
+              }
+            },
+            false
+          );
</ins><span class="cx"> 
</span><del>-        eventSource.addEventListener(
-          &quot;open&quot;,
-          function(e) {
-            accessStatusElement.innerHTML = &quot;Connected.&quot;;
-          },
-          false
-        );
</del><ins>+          eventSource.addEventListener(
+            eventClass,
+            function(e) {
+              // Append text
+              logViewElement.innerHTML += event.data + &quot;&lt;br /&gt;&quot;;
</ins><span class="cx"> 
</span><del>-        eventSource.addEventListener(
-          &quot;error&quot;,
-          function(e) {
-            if (e.readyState == EventSource.CLOSED) {
-              accessStatusElement.innerHTML = &quot;Conneciton closed.&quot;;
-            }
-            else {
-              accessStatusElement.innerHTML = &quot;Polling...&quot;;
-            }
-          },
-          false
-        );
</del><ins>+              // Scroll to bottom
+              logViewElement.scrollTop = logViewElement.scrollHeight;
+            },
+            false
+          );
+        }
</ins><span class="cx"> 
</span><del>-        eventSource.addEventListener(
-          &quot;access&quot;,
-          function(e) {
-            // Append text
-            accessLogElement.innerHTML += event.data + &quot;&lt;br /&gt;&quot;;
</del><ins>+        var eventSource = new EventSource(&quot;./events&quot;);
</ins><span class="cx"> 
</span><del>-            // Scroll to bottom
-            accessLogElement.scrollTop = accessLogElement.scrollHeight;
-          },
-          false
</del><ins>+        registerForEvents(
+          eventSource, &quot;access&quot;,
+          document.getElementById(&quot;access-log-status&quot;),
+          document.getElementById(&quot;access-log&quot;)
</ins><span class="cx">         );
</span><ins>+
+        registerForEvents(
+          eventSource, &quot;server&quot;,
+          document.getElementById(&quot;server-log-status&quot;),
+          document.getElementById(&quot;server-log&quot;)
+        );
</ins><span class="cx">       }
</span><span class="cx"> 
</span><span class="cx">     &lt;/script&gt;
</span><span class="lines">@@ -54,7 +65,7 @@
</span><span class="cx">     &lt;style&gt;
</span><span class="cx">       .log {
</span><span class="cx">         width: 100%;
</span><del>-        height: 150pt;
</del><ins>+        height: 200pt;
</ins><span class="cx"> 
</span><span class="cx">         overflow: scroll;
</span><span class="cx">         white-space: nowrap;
</span></span></pre>
</div>
</div>

</body>
</html>