<!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>[14650] CalendarServer/trunk</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/14650">14650</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-02 13:28:05 -0700 (Thu, 02 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweaks to memcache socket change tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_caldavpy">CalendarServer/trunk/calendarserver/tap/test/test_caldav.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmemcacheclientpy">CalendarServer/trunk/twistedcaldav/memcacheclient.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmemcachepoolpy">CalendarServer/trunk/twistedcaldav/memcachepool.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2015-04-02 18:47:45 UTC (rev 14649)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2015-04-02 20:28:05 UTC (rev 14650)
</span><span class="lines">@@ -1214,6 +1214,7 @@
</span><span class="cx"> config.BindAddresses = [""]
</span><span class="cx"> return config.BindAddresses
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def _spawnMemcached(self, monitor=None):
</span><span class="cx"> """
</span><span class="cx"> Optionally start memcached through the specified ProcessMonitor,
</span><span class="lines">@@ -1226,7 +1227,7 @@
</span><span class="cx"> "-U", "0",
</span><span class="cx"> ]
</span><span class="cx"> # Use Unix domain sockets by default
</span><del>- if "MemcacheSocket" in pool:
</del><ins>+ if pool.get("MemcacheSocket"):
</ins><span class="cx"> memcachedArgv.extend([
</span><span class="cx"> "-s", str(pool.MemcacheSocket),
</span><span class="cx"> ])
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaptesttest_caldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2015-04-02 18:47:45 UTC (rev 14649)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2015-04-02 20:28:05 UTC (rev 14650)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> )
</span><span class="cx"> from calendarserver.provision.root import RootResource
</span><span class="cx"> from StringIO import StringIO
</span><ins>+import tempfile
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -442,13 +443,14 @@
</span><span class="cx"> self.assertEquals(socketService.gid, self.alternateGroup)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MemcacheSpawner(TestCase):
</span><span class="cx">
</span><span class="cx"> def setUp(self):
</span><span class="cx"> super(MemcacheSpawner, self).setUp()
</span><span class="cx"> self.monitor = ProcessMonitor()
</span><span class="cx"> self.monitor.startService()
</span><del>- self.socket = os.path.abspath("memcache.sock")
</del><ins>+ self.socket = os.path.join(tempfile.gettempdir(), "memcache.sock")
</ins><span class="cx"> self.patch(config.Memcached.Pools.Default, "ServerEnabled", True)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -495,6 +497,7 @@
</span><span class="cx"> return self.monitor.stopService()
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ProcessMonitorTests(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmemcacheclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/memcacheclient.py (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/memcacheclient.py 2015-04-02 18:47:45 UTC (rev 14649)
+++ CalendarServer/trunk/twistedcaldav/memcacheclient.py 2015-04-02 20:28:05 UTC (rev 14650)
</span><span class="lines">@@ -1301,7 +1301,7 @@
</span><span class="cx"> if isinstance(msg, tuple):
</span><span class="cx"> msg = msg[1]
</span><span class="cx"> log.error("Memcacheclient _get_socket() connection error (%s)" % (msg,))
</span><del>- self.mark_dead("connect: %s" % msg[1])
</del><ins>+ self.mark_dead("connect: %s" % msg)
</ins><span class="cx"> return None
</span><span class="cx"> self.socket = s
</span><span class="cx"> self.buffer = ''
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmemcachepoolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/memcachepool.py (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/memcachepool.py 2015-04-02 18:47:45 UTC (rev 14649)
+++ CalendarServer/trunk/twistedcaldav/memcachepool.py 2015-04-02 20:28:05 UTC (rev 14650)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> for name, pool in pools.items():
</span><span class="cx"> if pool["ClientEnabled"]:
</span><del>- if "MemcacheSocket" in pool:
</del><ins>+ if pool.get("MemcacheSocket"):
</ins><span class="cx"> ep = UNIXClientEndpoint(reactor, pool["MemcacheSocket"])
</span><span class="cx"> else:
</span><span class="cx"> ep = GAIEndpoint(reactor, pool["BindAddress"], pool["Port"])
</span></span></pre>
</div>
</div>
</body>
</html>