<!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>[12638] CalendarServer/trunk/calendarserver/webadmin/logs.py</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/12638">12638</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 16:51:52 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Event sending seens good now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminlogspy">CalendarServer/trunk/calendarserver/webadmin/logs.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminlogspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py (12637 => 12638)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-02-10 21:33:34 UTC (rev 12637)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-02-11 00:51:52 UTC (rev 12638)
</span><span class="lines">@@ -15,6 +15,8 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+from __future__ import print_function
+
</ins><span class="cx"> """
</span><span class="cx"> Calendar Server Web Admin UI.
</span><span class="cx"> """
</span><span class="lines">@@ -71,7 +73,12 @@
</span><span class="cx"> self.putChild("events", LogEventsResource())
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def render(self, request):
+ self.element = LogsPageElement()
+ return TemplateResource.render(self, request)
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class LogEventsResource(Resource):
</span><span class="cx"> """
</span><span class="cx"> Log event vending resource.
</span><span class="lines">@@ -85,10 +92,23 @@
</span><span class="cx">
</span><span class="cx"> self._observer = AccessLoggingObserver()
</span><span class="cx">
</span><ins>+ self._observer.logMessage("Hello")
+ self._observer.logMessage("Yo")
+ self._observer.logMessage("Bonjour")
+ self._observer.logMessage("Hola")
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def render(self, request):
</span><ins>+ start = request.headers.getRawHeaders("last-event-id")
+
+ if start is not None:
+ try:
+ start = int(start[0])
+ except ValueError:
+ start = None
+
</ins><span class="cx"> response = Response()
</span><del>- response.stream = LogObservingEventStream(self._observer)
</del><ins>+ response.stream = LogObservingEventStream(self._observer, start)
</ins><span class="cx"> response.headers.setHeader(
</span><span class="cx"> "content-type", MimeType.fromString("text/event-stream")
</span><span class="cx"> )
</span><span class="lines">@@ -106,7 +126,7 @@
</span><span class="cx"> length = None
</span><span class="cx">
</span><span class="cx">
</span><del>- def __init__(self, observer, start=None):
</del><ins>+ def __init__(self, observer, start):
</ins><span class="cx"> object.__init__(self)
</span><span class="cx">
</span><span class="cx"> self._observer = observer
</span><span class="lines">@@ -120,31 +140,41 @@
</span><span class="cx">
</span><span class="cx"> start = self._start
</span><span class="cx">
</span><del>- events = []
</del><ins>+ print("Last seen message #: {0}".format(start))
</ins><span class="cx">
</span><ins>+ messageID = None
+
</ins><span class="cx"> for message in self._observer.messages():
</span><ins>+ messageID = id(message)
+
</ins><span class="cx"> # If we have a start point, skip messages up to and including the
</span><span class="cx"> # one at the start point.
</span><span class="cx"> if start is not None:
</span><del>- if id(message) == start:
</del><ins>+ print("Skipping message #{0}".format(messageID))
+
+ if messageID == start:
+ messageID = None
</ins><span class="cx"> start = None
</span><ins>+
</ins><span class="cx"> continue
</span><span class="cx">
</span><del>- events.append(textAsEvent(message))
</del><ins>+ print("Sending message #{0}".format(messageID))
</ins><span class="cx">
</span><del>- if events:
- # Remember the ID of the last event read at our start point
- self._start = id(events[-1])
</del><ins>+ self._start = messageID
</ins><span class="cx">
</span><del>- return succeed("".join(events))
</del><ins>+ from datetime import datetime
+ return succeed(textAsEvent(
+ u"{0}@{1}#{2}: {3}"
+ .format(id(self), datetime.now(), messageID, message),
+ messageID
+ ))
</ins><span class="cx">
</span><del>- if self._start is not None:
- # We have a start point and no data... maybe if fell off of the
- # buffer; remove the start point and try again.
</del><ins>+ if messageID is not None:
+ # We just scanned all the messages, and none are the last one the
+ # client saw.
</ins><span class="cx"> self._start = None
</span><span class="cx"> return self.read()
</span><span class="cx">
</span><del>- # No start point and no events == EOF
</del><span class="cx"> return succeed(None)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -169,6 +199,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def logMessage(self, message):
</span><ins>+ print("LOG: {0}".format(message))
+
</ins><span class="cx"> self._buffer.append(message)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -177,10 +209,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def textAsEvent(text):
</del><ins>+def textAsEvent(text, eventID):
</ins><span class="cx"> return (
</span><span class="cx"> u"id: {id}\n"
</span><span class="cx"> u"data: {text}\n"
</span><span class="cx"> u"\n"
</span><del>- .format(id=id(text), text=text).encode("utf-8")
</del><ins>+ .format(id=eventID, text=text).encode("utf-8")
</ins><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>