<!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>[12804] CalendarServer/trunk/calendarserver/webadmin</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/12804">12804</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-04 18:21:33 -0800 (Tue, 04 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Send retry interval for events.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadmineventsourcepy">CalendarServer/trunk/calendarserver/webadmin/eventsource.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkpy">CalendarServer/trunk/calendarserver/webadmin/work.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadmineventsourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/eventsource.py (12803 => 12804)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/eventsource.py        2014-03-04 23:51:38 UTC (rev 12803)
+++ CalendarServer/trunk/calendarserver/webadmin/eventsource.py        2014-03-05 02:21:33 UTC (rev 12804)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-def textAsEvent(text, eventID=None, eventClass=None):
</del><ins>+def textAsEvent(text, eventID=None, eventClass=None, eventRetry=None):
</ins><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Format some text as an HTML5 EventSource event.  Since the EventSource data
</span><span class="cx">     format is text-oriented, this function expects L{unicode}, not L{bytes};
</span><span class="lines">@@ -60,6 +60,10 @@
</span><span class="cx">     @param eventClass: A class name (ie. a categorization) for the event.
</span><span class="cx">     @type eventClass: L{unicode}
</span><span class="cx"> 
</span><ins>+    @param eventRetry: The retry interval (in milliseconds) for the client to
+        wait before reconnecting if it gets disconnected.
+    @type eventRetry: L{int}
+
</ins><span class="cx">     @return: An HTML5 EventSource event as text.
</span><span class="cx">     @rtype: UTF-8 encoded L{bytes}
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="lines">@@ -74,6 +78,9 @@
</span><span class="cx">     if eventClass is not None:
</span><span class="cx">         event.append(u&quot;event: {0}&quot;.format(eventClass))
</span><span class="cx"> 
</span><ins>+    if eventRetry is not None:
+        event.append(u&quot;retry: {0:d}&quot;.format(eventRetry))
+
</ins><span class="cx">     event.extend(
</span><span class="cx">         u&quot;data: {0}&quot;.format(l) for l in text.split(&quot;\n&quot;)
</span><span class="cx">     )
</span><span class="lines">@@ -106,6 +113,12 @@
</span><span class="cx">         @rtype: L{unicode}
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><ins>+    def retryForEvent(event):
+        &quot;&quot;&quot;
+        @return: The retry interval (in milliseconds) for the client to wait
+            before reconnecting if it gets disconnected.
+        @rtype: L{int}
+        &quot;&quot;&quot;
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class EventSourceResource(Resource):
</span><span class="lines">@@ -212,6 +225,7 @@
</span><span class="cx">         idForEvent = self._eventDecoder.idForEvent
</span><span class="cx">         classForEvent = self._eventDecoder.classForEvent
</span><span class="cx">         textForEvent = self._eventDecoder.textForEvent
</span><ins>+        retryForEvent = self._eventDecoder.retryForEvent
</ins><span class="cx"> 
</span><span class="cx">         for event in self._events:
</span><span class="cx">             eventID = idForEvent(event)
</span><span class="lines">@@ -227,11 +241,12 @@
</span><span class="cx"> 
</span><span class="cx">             eventClass = classForEvent(event)
</span><span class="cx">             eventText = textForEvent(event)
</span><ins>+            eventRetry = retryForEvent(event)
</ins><span class="cx"> 
</span><span class="cx">             self._lastID = eventID
</span><span class="cx"> 
</span><span class="cx">             return succeed(
</span><del>-                textAsEvent(eventText, eventID, eventClass)
</del><ins>+                textAsEvent(eventText, eventID, eventClass, eventRetry)
</ins><span class="cx">             )
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminworkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.py (12803 => 12804)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.py        2014-03-04 23:51:38 UTC (rev 12803)
+++ CalendarServer/trunk/calendarserver/webadmin/work.py        2014-03-05 02:21:33 UTC (rev 12804)
</span><span class="lines">@@ -89,11 +89,13 @@
</span><span class="cx">     Resource that vends work queue information via HTML5 EventSource events.
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-    def __init__(self, store):
</del><ins>+    def __init__(self, store, pollInterval=1):
</ins><span class="cx">         EventSourceResource.__init__(self, EventDecoder, bufferSize=1)
</span><span class="cx"> 
</span><span class="cx">         self._store = store
</span><ins>+        self._pollInterval = pollInterval
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def render(self, request):
</span><span class="cx">         yield self.poll()
</span><span class="lines">@@ -111,6 +113,7 @@
</span><span class="cx">                 eventClass=u&quot;work-total&quot;,
</span><span class="cx">                 eventID=time(),
</span><span class="cx">                 eventText=asJSON(jobData),
</span><ins>+                eventRetry=(self._pollInterval * 1000),
</ins><span class="cx">             ),
</span><span class="cx">         ))
</span><span class="cx"> 
</span><span class="lines">@@ -118,7 +121,7 @@
</span><span class="cx">             from twisted.internet import reactor
</span><span class="cx">             self._clock = reactor
</span><span class="cx"> 
</span><del>-        self._clock.callLater(1, self.poll)
</del><ins>+        self._clock.callLater(self._pollInterval, self.poll)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -139,6 +142,11 @@
</span><span class="cx">         return event.get(&quot;eventText&quot;)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    @staticmethod
+    def retryForEvent(event):
+        return event.get(&quot;eventRetry&quot;)
</ins><span class="cx"> 
</span><ins>+
+
</ins><span class="cx"> def asJSON(obj):
</span><span class="cx">     return dumps(obj, separators=(',', ':'))
</span></span></pre>
</div>
</div>

</body>
</html>