<!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>[14147] CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule</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/14147">14147</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-11-07 13:27:24 -0800 (Fri, 07 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix bug with empty results from DNS SRV lookup.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_utilspy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_utils.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleutilspy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/utils.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduletestdatadbemptyzone">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/data/db.empty.zone</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduletestdatadbemptyzone"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/data/db.empty.zone (0 => 14147)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/data/db.empty.zone (rev 0)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/data/db.empty.zone 2014-11-07 21:27:24 UTC (rev 14147)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+example.com. 10800 IN SOA ns.example.com. admin.example.com. (
+ 2012090810 ; serial
+ 3600 ; refresh (1 hour)
+ 900 ; retry (15 minutes)
+ 1209600 ; expire (2 weeks)
+ 86400 ; minimum (1 day)
+ )
+ 10800 IN NS ns.example.com.
+ 10800 IN A 127.0.0.1
+ns.example.com. 10800 IN A 127.0.0.1
+
+_ischedules._tcp.example.com. 10800 IN TXT "empty"
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_utilspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_utils.py (14146 => 14147)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_utils.py 2014-11-07 19:04:06 UTC (rev 14146)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_utils.py 2014-11-07 21:27:24 UTC (rev 14147)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> ("example.com", "example.com", 8443,),
</span><span class="cx"> ("example.org", "example.org", 8543,),
</span><span class="cx"> ),),
</span><ins>+ ("db.empty.zone", (("example.com", "", 0,),),),
</ins><span class="cx"> ):
</span><span class="cx"> module = getModule(__name__)
</span><span class="cx"> dataPath = module.filePath.sibling("data")
</span><span class="lines">@@ -86,7 +87,12 @@
</span><span class="cx"> utils.DebugResolver = None
</span><span class="cx">
</span><span class="cx"> for domain, result_host, result_port in checks:
</span><del>- host, port = (yield utils.lookupServerViaSRV(domain))
</del><ins>+ result = (yield utils.lookupServerViaSRV(domain))
+ if result is None:
+ host = ""
+ port = 0
+ else:
+ host, port = result
</ins><span class="cx"> self.assertEqual(host, result_host)
</span><span class="cx"> self.assertEqual(port, result_port)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleutilspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/utils.py (14146 => 14147)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/utils.py 2014-11-07 19:04:06 UTC (rev 14146)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/utils.py 2014-11-07 21:27:24 UTC (rev 14147)
</span><span class="lines">@@ -91,6 +91,10 @@
</span><span class="cx"> else:
</span><span class="cx"> return cmp(a[1], b[1])
</span><span class="cx">
</span><ins>+ if not servers:
+ log.debug("DNS SRV: no matching records: {l}", l=lookup)
+ returnValue(None)
+
</ins><span class="cx"> servers.sort(_serverCmp)
</span><span class="cx"> minPriority = servers[0][0]
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>