<!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>[12639] 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/12639">12639</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 17:31:31 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add event type.</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 (12638 => 12639)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-02-11 00:51:52 UTC (rev 12638)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-02-11 01:31:31 UTC (rev 12639)
</span><span class="lines">@@ -92,10 +92,10 @@
</span><span class="cx">
</span><span class="cx"> self._observer = AccessLoggingObserver()
</span><span class="cx">
</span><del>- self._observer.logMessage("Hello")
- self._observer.logMessage("Yo")
- self._observer.logMessage("Bonjour")
- self._observer.logMessage("Hola")
</del><ins>+ self._observer.logMessage(u"Hello")
+ self._observer.logMessage(u"Yo")
+ self._observer.logMessage(u"Bonjour")
+ self._observer.logMessage(u"Hola")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def render(self, request):
</span><span class="lines">@@ -139,9 +139,6 @@
</span><span class="cx"> return None
</span><span class="cx">
</span><span class="cx"> start = self._start
</span><del>-
- print("Last seen message #: {0}".format(start))
-
</del><span class="cx"> messageID = None
</span><span class="cx">
</span><span class="cx"> for message in self._observer.messages():
</span><span class="lines">@@ -150,25 +147,20 @@
</span><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>- print("Skipping message #{0}".format(messageID))
-
</del><span class="cx"> if messageID == start:
</span><span class="cx"> messageID = None
</span><span class="cx"> start = None
</span><span class="cx">
</span><span class="cx"> continue
</span><span class="cx">
</span><del>- print("Sending message #{0}".format(messageID))
-
</del><span class="cx"> self._start = messageID
</span><span class="cx">
</span><del>- from datetime import datetime
- return succeed(textAsEvent(
- u"{0}@{1}#{2}: {3}"
- .format(id(self), datetime.now(), messageID, message),
- messageID
- ))
</del><ins>+ eventText = textAsEvent(
+ message, eventID=id(message), eventClass=u"access"
+ )
</ins><span class="cx">
</span><ins>+ return succeed(eventText)
+
</ins><span class="cx"> if messageID is not None:
</span><span class="cx"> # We just scanned all the messages, and none are the last one the
</span><span class="cx"> # client saw.
</span><span class="lines">@@ -195,7 +187,7 @@
</span><span class="cx"> def __init__(self):
</span><span class="cx"> CommonAccessLoggingObserverExtensions.__init__(self)
</span><span class="cx">
</span><del>- self._buffer = deque(maxlen=400)
</del><ins>+ self._buffer = deque(maxlen=100)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def logMessage(self, message):
</span><span class="lines">@@ -209,10 +201,17 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def textAsEvent(text, eventID):
- return (
- u"id: {id}\n"
- u"data: {text}\n"
- u"\n"
- .format(id=eventID, text=text).encode("utf-8")
</del><ins>+def textAsEvent(text, eventID=None, eventClass=None):
+ event = []
+
+ if eventID is not None:
+ event.append(u"id: {0}".format(eventID))
+
+ if eventClass is not None:
+ event.append(u"event: {0}".format(eventClass))
+
+ event.extend(
+ u"data: {0}".format(l) for l in text.split("\n")
</ins><span class="cx"> )
</span><ins>+
+ return u"\n".join(event).encode("utf-8") + "\n\n"
</ins></span></pre>
</div>
</div>
</body>
</html>