<!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>[9508] 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.macosforge.org/projects/calendarserver/changeset/9508">9508</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2012-07-30 13:50:34 -0700 (Mon, 30 Jul 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Whenever proxies are changed, trigger a group cacher update</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsprincipalspy">CalendarServer/trunk/calendarserver/tools/principals.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_principalspy">CalendarServer/trunk/calendarserver/tools/test/test_principals.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorydirectorypy">CalendarServer/trunk/twistedcaldav/directory/directory.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 (9507 => 9508)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py        2012-07-30 17:23:16 UTC (rev 9507)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py        2012-07-30 20:50:34 UTC (rev 9508)
</span><span class="lines">@@ -557,6 +557,7 @@
</span><span class="cx">                 &quot;--reactor=%s&quot; % (config.Twisted.reactor,),
</span><span class="cx">                 &quot;-n&quot;, self.maker.groupMembershipCacherTapName,
</span><span class="cx">                 &quot;-f&quot;, self.configPath,
</span><ins>+                &quot;-o&quot;, &quot;PIDFile=groupcacher.pid&quot;,
</ins><span class="cx">             ))
</span><span class="cx"> 
</span><span class="cx">             self.monitor.addProcess(&quot;groupcacher&quot;, groupMembershipCacherArgv,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/principals.py (9507 => 9508)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/principals.py        2012-07-30 17:23:16 UTC (rev 9507)
+++ CalendarServer/trunk/calendarserver/tools/principals.py        2012-07-30 20:50:34 UTC (rev 9508)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> import sys
</span><span class="cx"> import os
</span><span class="cx"> import operator
</span><ins>+import signal
</ins><span class="cx"> from getopt import getopt, GetoptError
</span><span class="cx"> from uuid import UUID
</span><span class="cx"> from pwd import getpwnam
</span><span class="lines">@@ -593,7 +594,9 @@
</span><span class="cx"> 
</span><span class="cx">     (yield action_removeProxyPrincipal(principal, proxyPrincipal, proxyTypes=proxyTypes))
</span><span class="cx"> 
</span><ins>+    triggerGroupCacherUpdate(config)
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def setProxies(principal, readProxyPrincipals, writeProxyPrincipals, directory=None):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="lines">@@ -621,6 +624,7 @@
</span><span class="cx">             memberURLs.append(davxml.HRef(proxyURL))
</span><span class="cx">         membersProperty = davxml.GroupMemberSet(*memberURLs)
</span><span class="cx">         (yield subPrincipal.writeProperty(membersProperty, None))
</span><ins>+        triggerGroupCacherUpdate(config)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -697,7 +701,9 @@
</span><span class="cx">         membersProperty = davxml.GroupMemberSet(*memberURLs)
</span><span class="cx">         (yield subPrincipal.writeProperty(membersProperty, None))
</span><span class="cx"> 
</span><del>-        returnValue(removed)
</del><ins>+    if removed:
+        triggerGroupCacherUpdate(config)
+    returnValue(removed)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -898,7 +904,28 @@
</span><span class="cx">     returnValue(record)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+def triggerGroupCacherUpdate(config, killMethod=None):
+    &quot;&quot;&quot;
+    Look up the pid of the group cacher sidecar and HUP it to trigger an update
+    &quot;&quot;&quot;
+    if killMethod is None:
+        killMethod = os.kill
</ins><span class="cx"> 
</span><ins>+    pidFilename = os.path.join(config.RunRoot, &quot;groupcacher.pid&quot;)
+    if os.path.exists(pidFilename):
+        pidFile = open(pidFilename, &quot;r&quot;)
+        pid = pidFile.read().strip()
+        pidFile.close()
+        try:
+            pid = int(pid)
+        except ValueError:
+            return
+        try:
+            killMethod(pid, signal.SIGHUP)
+        except OSError:
+            pass
</ins><span class="cx"> 
</span><ins>+
+
</ins><span class="cx"> if __name__ == &quot;__main__&quot;:
</span><span class="cx">     main()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_principalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py (9507 => 9508)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py        2012-07-30 17:23:16 UTC (rev 9507)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py        2012-07-30 20:50:34 UTC (rev 9508)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> ##
</span><span class="cx"> 
</span><span class="cx"> import os
</span><ins>+import signal
</ins><span class="cx"> import sys
</span><span class="cx"> 
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="lines">@@ -29,7 +30,9 @@
</span><span class="cx">     ErrorOutput
</span><span class="cx"> 
</span><span class="cx"> from calendarserver.tap.util import directoryFromConfig
</span><del>-from calendarserver.tools.principals import parseCreationArgs, matchStrings, updateRecord, principalForPrincipalID, getProxies, setProxies
</del><ins>+from calendarserver.tools.principals import (parseCreationArgs, matchStrings,
+    updateRecord, principalForPrincipalID, getProxies, setProxies,
+    triggerGroupCacherUpdate)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class ManagePrincipalsTestCase(TestCase):
</span><span class="lines">@@ -347,3 +350,25 @@
</span><span class="cx">         self.assertEquals(readProxies, []) # now empty
</span><span class="cx">         self.assertEquals(set(writeProxies), set([&quot;user05&quot;])) # unchanged
</span><span class="cx"> 
</span><ins>+
+    def test_triggerGroupCacherUpdate(self):
+        &quot;&quot;&quot;
+        Verify triggerGroupCacherUpdate can read a pidfile and send a SIGHUP
+        &quot;&quot;&quot;
+
+        self.calledArgs = None
+        def killMethod(pid, sig):
+            self.calledArgs = (pid, sig)
+
+        class StubConfig(object):
+            def __init__(self, runRootPath):
+                self.RunRoot = runRootPath
+
+        runRootDir = FilePath(self.mktemp())
+        runRootDir.createDirectory()
+        pidFile = runRootDir.child(&quot;groupcacher.pid&quot;)
+        pidFile.setContent(&quot;1234&quot;)
+        testConfig = StubConfig(runRootDir.path)
+        triggerGroupCacherUpdate(testConfig, killMethod=killMethod)
+        self.assertEquals(self.calledArgs, (1234, signal.SIGHUP))
+        runRootDir.remove()
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorydirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py (9507 => 9508)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/directory.py        2012-07-30 17:23:16 UTC (rev 9507)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py        2012-07-30 20:50:34 UTC (rev 9508)
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx">     def postOptions(self):
</span><span class="cx">         config.load(self['config'])
</span><span class="cx">         config.updateDefaults(self.overrides)
</span><del>-        self.parent['pidfile'] = None
</del><ins>+        self.parent['pidfile'] = config.PIDFile
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>