<!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>[12773] 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/12773">12773</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-27 16:23:44 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Send EOF when we run out of events; blocking doesn't work when run in server for some reason.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadmineventsourcepy">CalendarServer/trunk/calendarserver/webadmin/eventsource.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadmintesttest_eventsourcepy">CalendarServer/trunk/calendarserver/webadmin/test/test_eventsource.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 (12772 => 12773)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/eventsource.py 2014-02-27 23:46:45 UTC (rev 12772)
+++ CalendarServer/trunk/calendarserver/webadmin/eventsource.py 2014-02-28 00:23:44 UTC (rev 12773)
</span><span class="lines">@@ -153,9 +153,11 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Keep track of the event streams
</span><del>- request.addResponseFilter(
- lambda r: self._streams.remove(response.stream)
- )
</del><ins>+ def cleanupFilter(_request, _response):
+ self._streams.remove(response.stream)
+ return _response
+
+ request.addResponseFilter(cleanupFilter)
</ins><span class="cx"> self._streams.add(response.stream)
</span><span class="cx">
</span><span class="cx"> return response
</span><span class="lines">@@ -240,6 +242,10 @@
</span><span class="cx">
</span><span class="cx"> return succeed(b"")
</span><span class="cx">
</span><ins>+ # This causes the client to poll, which is undesirable, but the
+ # deferred below doesn't seem to work in real use...
+ return succeed(None)
+
</ins><span class="cx"> d = Deferred()
</span><span class="cx"> self._deferredRead = d
</span><span class="cx"> return d
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadmintesttest_eventsourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/test/test_eventsource.py (12772 => 12773)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/test/test_eventsource.py 2014-02-27 23:46:45 UTC (rev 12772)
+++ CalendarServer/trunk/calendarserver/webadmin/test/test_eventsource.py 2014-02-28 00:23:44 UTC (rev 12773)
</span><span class="lines">@@ -203,14 +203,25 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><del>- # The next read should block on new events.
</del><ins>+
+ @inlineCallbacks
+ def test_streamWaitForEvents(self):
+ """
+ Stream reading blocks on additional events.
+ """
+ resource = self.eventSourceResource()
+ response = self.render(resource)
+
+ # Read should block on new events.
</ins><span class="cx"> d = response.stream.read()
</span><span class="cx"> self.assertFalse(d.called)
</span><span class="cx">
</span><span class="cx"> d.addErrback(lambda f: None)
</span><span class="cx"> d.cancel()
</span><span class="cx">
</span><ins>+ test_streamWaitForEvents.todo = "Feature disabled; needs debugging"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_streamNewEvents(self):
</span><span class="cx"> """
</span><span class="lines">@@ -260,6 +271,7 @@
</span><span class="cx"> d.addErrback(lambda f: None)
</span><span class="cx"> d.cancel()
</span><span class="cx">
</span><ins>+ test_streamNewEvents.todo = "Feature disabled; needs debugging"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @implementer(IEventDecoder)
</span></span></pre>
</div>
</div>
</body>
</html>