<!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>[13627] 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/13627">13627</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 12:33:46 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enabling automatic purge of data for principals no longer in the directory</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolscmdlinepy">CalendarServer/trunk/calendarserver/tools/cmdline.py</a></li>
<li><a href="#CalendarServertrunkconfcaldavdappleplist">CalendarServer/trunk/conf/caldavd-apple.plist</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 (13626 => 13627)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2014-06-10 19:22:05 UTC (rev 13626)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2014-06-10 19:33:46 UTC (rev 13627)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> from twext.enterprise.jobqueue import WorkerFactory as QueueWorkerFactory
</span><span class="cx"> from twext.application.service import ReExecService
</span><span class="cx"> from txdav.who.groups import GroupCacherPollingWork
</span><ins>+from calendarserver.tools.purge import PrincipalPurgePollingWork
</ins><span class="cx">
</span><span class="cx"> from txweb2.channel.http import (
</span><span class="cx"> LimitingHTTPFactory, SSLRedirectRequest, HTTPChannel
</span><span class="lines">@@ -568,7 +569,7 @@
</span><span class="cx"> """
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><del>- def __init__(self, store, doImip, doGroupCaching):
</del><ins>+ def __init__(self, store, doImip, doGroupCaching, doPrincipalPurging):
</ins><span class="cx"> """
</span><span class="cx"> @param store: the Store to use for enqueuing work
</span><span class="cx"> @param doImip: whether to schedule imip polling
</span><span class="lines">@@ -579,6 +580,7 @@
</span><span class="cx"> self.store = store
</span><span class="cx"> self.doImip = doImip
</span><span class="cx"> self.doGroupCaching = doGroupCaching
</span><ins>+ self.doPrincipalPurging = doPrincipalPurging
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -597,6 +599,11 @@
</span><span class="cx"> self.store,
</span><span class="cx"> int(config.LogID) if config.LogID else 5
</span><span class="cx"> )
</span><ins>+ if self.doPrincipalPurging:
+ yield PrincipalPurgePollingWork.initialSchedule(
+ self.store,
+ int(config.LogID) if config.LogID else 5
+ )
</ins><span class="cx"> yield FindMinValidRevisionWork.initialSchedule(
</span><span class="cx"> self.store,
</span><span class="cx"> int(config.LogID) if config.LogID else 5
</span><span class="lines">@@ -606,15 +613,8 @@
</span><span class="cx"> int(config.LogID) if config.LogID else 5
</span><span class="cx"> )
</span><span class="cx">
</span><del>- # FIXME: uncomment this when purge is working
- # from calendarserver.tools.purge import scheduleNextPrincipalPurgeUpdate
- # yield PrincipalPurgePollingWork.initialSchedule(
- # self.store,
- # int(config.LogID) if config.LogID else 5
- # )
</del><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class PreProcessingService(Service):
</span><span class="cx"> """
</span><span class="cx"> A Service responsible for running any work that needs to be finished prior
</span><span class="lines">@@ -1100,7 +1100,8 @@
</span><span class="cx"> WorkSchedulingService(
</span><span class="cx"> store,
</span><span class="cx"> config.Scheduling.iMIP.Enabled,
</span><del>- (config.GroupCaching.Enabled and config.GroupCaching.EnableUpdater)
</del><ins>+ (config.GroupCaching.Enabled and config.GroupCaching.EnableUpdater),
+ config.AutomaticPurging.Enabled
</ins><span class="cx"> ).setServiceParent(service)
</span><span class="cx">
</span><span class="cx"> # For calendarserver.tap.test
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolscmdlinepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/cmdline.py (13626 => 13627)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/cmdline.py 2014-06-10 19:22:05 UTC (rev 13626)
+++ CalendarServer/trunk/calendarserver/tools/cmdline.py 2014-06-10 19:33:46 UTC (rev 13627)
</span><span class="lines">@@ -18,8 +18,6 @@
</span><span class="cx"> Shared main-point between utilities.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from twistedcaldav.stdconfig import config
-from calendarserver.tap.caldav import CalDAVServiceMaker, CalDAVOptions
</del><span class="cx"> from calendarserver.tap.util import checkDirectories
</span><span class="cx"> from calendarserver.tools.util import loadConfig, autoDisableMemcached
</span><span class="cx">
</span><span class="lines">@@ -37,7 +35,10 @@
</span><span class="cx"> # TODO: direct unit tests for these functions.
</span><span class="cx">
</span><span class="cx">
</span><del>-def utilityMain(configFileName, serviceClass, reactor=None, serviceMaker=CalDAVServiceMaker, patchConfig=None, onShutdown=None, verbose=False):
</del><ins>+def utilityMain(
+ configFileName, serviceClass, reactor=None, serviceMaker=None,
+ patchConfig=None, onShutdown=None, verbose=False
+):
</ins><span class="cx"> """
</span><span class="cx"> Shared main-point for utilities.
</span><span class="cx">
</span><span class="lines">@@ -69,6 +70,10 @@
</span><span class="cx"> will be imported and used.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ from calendarserver.tap.caldav import CalDAVServiceMaker, CalDAVOptions
+ if serviceMaker is None:
+ serviceMaker = CalDAVServiceMaker
+
</ins><span class="cx"> # We want to validate that the actual service is always an instance of WorkerService, so wrap the
</span><span class="cx"> # service maker callback inside a function that does that check
</span><span class="cx"> def _makeValidService(store):
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-apple.plist (13626 => 13627)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-apple.plist 2014-06-10 19:22:05 UTC (rev 13626)
+++ CalendarServer/trunk/conf/caldavd-apple.plist 2014-06-10 19:33:46 UTC (rev 13627)
</span><span class="lines">@@ -528,19 +528,29 @@
</span><span class="cx"> <!-- Directory searching -->
</span><span class="cx"> <key>DirectoryAddressBook</key>
</span><span class="cx"> <dict>
</span><del>- <key>Enabled</key>
- <true/>
- <key>params</key>
- <dict>
- <key>queryUserRecords</key>
- <false/>
- <key>queryPeopleRecords</key>
- <false/>
- </dict>
</del><ins>+ <key>Enabled</key>
+ <true/>
+ <key>params</key>
+ <dict>
+ <key>queryUserRecords</key>
+ <false/>
+ <key>queryPeopleRecords</key>
+ <false/>
+ </dict>
</ins><span class="cx"> </dict>
</span><ins>+
</ins><span class="cx"> <key>EnableSearchAddressBook</key>
</span><span class="cx"> <false/>
</span><span class="cx">
</span><ins>+
+ <!-- Automatic purging of data for principals no longer in the directory
+ -->
+ <key>AutomaticPurging</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ </dict>
+
</ins><span class="cx"> <key>Includes</key>
</span><span class="cx"> <array>
</span><span class="cx"> <string>/Library/Preferences/com.apple.servermgr_calendar.plist</string>
</span></span></pre>
</div>
</div>
</body>
</html>