<!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>[12745] 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/12745">12745</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 11:14:24 -0800 (Mon, 24 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>use cofig dicts with explicit Enabled for inbox and revision cleanup work</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworkinbox_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworktesttest_inbox_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/test/test_inbox_cleanup.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworktesttest_revision_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (12744 => 12745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py        2014-02-24 17:56:03 UTC (rev 12744)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py        2014-02-24 19:14:24 UTC (rev 12745)
</span><span class="lines">@@ -634,12 +634,18 @@
</span><span class="cx"> 
</span><span class="cx">     &quot;RemoveDuplicatePrivateComments&quot;: False, # Remove duplicate private comments on PUT
</span><span class="cx"> 
</span><del>-    &quot;SyncTokenLifetimeDays&quot; : 14.0,     # Number of days that a client sync report token is valid
-    &quot;RevisionCleanupPeriodDays&quot; : 2.0,  # Number of days between revision cleanups
</del><ins>+    &quot;RevisionCleanup&quot;: {
+        &quot;Enabled&quot;: True,
+        &quot;SyncTokenLifetimeDays&quot; : 14.0,     # Number of days that a client sync report token is valid
+        &quot;CleanupPeriodDays&quot; : 2.0,  # Number of days between revision cleanups
+    },
</ins><span class="cx"> 
</span><del>-    &quot;InboxItemLifetimeDays&quot; : 14.0,             # Number of days before deleting a new inbox item
-    &quot;InboxItemLifetimePastEventEndDays&quot; : 14.0, # Number of days to keep an inbox item past the time when its referenced event ends
-    &quot;InboxCleanupPeriodDays&quot; : 2.0,             # Number of days between inbox cleanups
</del><ins>+    &quot;InboxCleanup&quot;: {
+        &quot;Enabled&quot;: True,
+        &quot;ItemLifetimeDays&quot; : 14.0,             # Number of days before deleting a new inbox item
+        &quot;ItemLifeBeyondEventEndDays&quot; : 14.0, # Number of days to keep an inbox item past the time when its referenced event ends
+        &quot;CleanupPeriodDays&quot; : 2.0,             # Number of days between inbox cleanups
+    },
</ins><span class="cx"> 
</span><span class="cx">     # CardDAV Features
</span><span class="cx">     &quot;DirectoryAddressBook&quot;: {
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworkinbox_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py (12744 => 12745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py        2014-02-24 17:56:03 UTC (rev 12744)
+++ CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py        2014-02-24 19:14:24 UTC (rev 12745)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">         # Schedule next check
</span><span class="cx">         yield self._schedule(
</span><span class="cx">             self.transaction,
</span><del>-            float(config.InboxCleanupPeriodDays) * 24 * 60 * 60
</del><ins>+            float(config.InboxCleanup.CleanupPeriodDays) * 24 * 60 * 60
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -111,8 +111,8 @@
</span><span class="cx">                 homeID=self.uid(), orphanNames=orphanNames))
</span><span class="cx"> 
</span><span class="cx">         # get old item names
</span><del>-        if float(config.InboxItemLifetimeDays) &gt;= 0: # use -1 to disable; 0 is test case
-            cutoff = datetime.datetime.utcnow() - datetime.timedelta(days=float(config.InboxItemLifetimeDays))
</del><ins>+        if float(config.InboxCleanup.ItemLifetimeDays) &gt;= 0: # use -1 to disable; 0 is test case
+            cutoff = datetime.datetime.utcnow() - datetime.timedelta(days=float(config.InboxCleanup.ItemLifetimeDays))
</ins><span class="cx">             oldItemNames = set((
</span><span class="cx">                 yield self.transaction.listInboxItemsInHomeCreatedBefore(self.homeID, cutoff)
</span><span class="cx">             ))
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx">             oldItemNames = set()
</span><span class="cx"> 
</span><span class="cx">         # get item name for old events
</span><del>-        if float(config.InboxItemLifetimePastEventEndDays) &gt;= 0: # use -1 to disable; 0 is test case
-            cutoff = datetime.datetime.utcnow() - datetime.timedelta(days=float(config.InboxItemLifetimePastEventEndDays))
</del><ins>+        if float(config.InboxCleanup.ItemLifeBeyondEventEndDays) &gt;= 0: # use -1 to disable; 0 is test case
+            cutoff = datetime.datetime.utcnow() - datetime.timedelta(days=float(config.InboxCleanup.ItemLifeBeyondEventEndDays))
</ins><span class="cx">             itemNamesForOldEvents = set((
</span><span class="cx">                 yield self.transaction.listInboxItemsInHomeForEventsBefore(self.homeID, cutoff)
</span><span class="cx">             ))
</span><span class="lines">@@ -148,7 +148,10 @@
</span><span class="cx"> 
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def scheduleFirstInboxCleanup(store, seconds):
</span><del>-    txn = store.newTransaction()
-    wp = yield InboxCleanupWork._schedule(txn, seconds)
-    yield txn.commit()
-    returnValue(wp)
</del><ins>+    if config.InboxCleanup.Enabled:
+        txn = store.newTransaction()
+        wp = yield InboxCleanupWork._schedule(txn, seconds)
+        yield txn.commit()
+        returnValue(wp)
+    else:
+        log.debug(&quot;Inbox cleanup work disabled.&quot;)
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py (12744 => 12745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py        2014-02-24 17:56:03 UTC (rev 12744)
+++ CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py        2014-02-24 19:14:24 UTC (rev 12745)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> 
</span><span class="cx">         # get max revision on table rows before dateLimit
</span><span class="cx">         dateLimit = (datetime.datetime.utcnow() -
</span><del>-            datetime.timedelta(days=float(config.SyncTokenLifetimeDays)))
</del><ins>+            datetime.timedelta(days=float(config.RevisionCleanup.SyncTokenLifetimeDays)))
</ins><span class="cx">         maxRevOlderThanDate = 0
</span><span class="cx"> 
</span><span class="cx">         # TODO: Use one Select statement
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">             # Schedule next check
</span><span class="cx">             yield FindMinValidRevisionWork._schedule(
</span><span class="cx">                 self.transaction,
</span><del>-                float(config.RevisionCleanupPeriodDays) * 24 * 60 * 60
</del><ins>+                float(config.RevisionCleanup.CleanupPeriodDays) * 24 * 60 * 60
</ins><span class="cx">             )
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -122,14 +122,17 @@
</span><span class="cx">         # Schedule next update
</span><span class="cx">         yield FindMinValidRevisionWork._schedule(
</span><span class="cx">             self.transaction,
</span><del>-            float(config.RevisionCleanupPeriodDays) * 24 * 60 * 60
</del><ins>+            float(config.RevisionCleanup.CleanupPeriodDays) * 24 * 60 * 60
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def scheduleFirstFindMinRevision(store, seconds):
</span><del>-    txn = store.newTransaction()
-    wp = yield FindMinValidRevisionWork._schedule(txn, seconds)
-    yield txn.commit()
-    returnValue(wp)
</del><ins>+    if config.RevisionCleanup.Enabled:
+        txn = store.newTransaction()
+        wp = yield FindMinValidRevisionWork._schedule(txn, seconds)
+        yield txn.commit()
+        returnValue(wp)
+    else:
+        log.debug(&quot;Revision cleanup work disabled.&quot;)
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworktesttest_inbox_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/test/test_inbox_cleanup.py (12744 => 12745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/test/test_inbox_cleanup.py        2014-02-24 17:56:03 UTC (rev 12744)
+++ CalendarServer/trunk/txdav/common/datastore/work/test/test_inbox_cleanup.py        2014-02-24 19:14:24 UTC (rev 12745)
</span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Verify that orphaned Inbox items are removed
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        self.patch(config, &quot;InboxItemLifetimeDays&quot;, -1)
-        self.patch(config, &quot;InboxItemLifetimePastEventEndDays&quot;, -1)
</del><ins>+        self.patch(config.InboxCleanup, &quot;ItemLifetimeDays&quot;, -1)
+        self.patch(config.InboxCleanup, &quot;ItemLifeBeyondEventEndDays&quot;, -1)
</ins><span class="cx"> 
</span><span class="cx">         #create orphans by deleting events
</span><span class="cx">         inbox = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;inbox&quot;)
</span><span class="lines">@@ -195,11 +195,11 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Verify that old inbox items are removed
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        self.patch(config, &quot;InboxItemLifetimePastEventEndDays&quot;, -1)
</del><ins>+        self.patch(config.InboxCleanup, &quot;ItemLifeBeyondEventEndDays&quot;, -1)
</ins><span class="cx"> 
</span><span class="cx">         # Predate some inbox items
</span><span class="cx">         inbox = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;inbox&quot;)
</span><del>-        oldDate = datetime.datetime.utcnow() - datetime.timedelta(days=float(config.InboxItemLifetimeDays), seconds=10)
</del><ins>+        oldDate = datetime.datetime.utcnow() - datetime.timedelta(days=float(config.InboxCleanup.ItemLifetimeDays), seconds=10)
</ins><span class="cx"> 
</span><span class="cx">         itemsToPredate = [&quot;cal2.ics&quot;, &quot;cal3.ics&quot;]
</span><span class="cx">         co = schema.CALENDAR_OBJECT
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworktesttest_revision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py (12744 => 12745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-02-24 17:56:03 UTC (rev 12744)
+++ CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-02-24 19:14:24 UTC (rev 12745)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> 
</span><span class="cx">         self.patch(FindMinValidRevisionWork, &quot;_schedule&quot;, FakeWork._schedule)
</span><span class="cx">         self.patch(RevisionCleanupWork, &quot;_schedule&quot;, FakeWork._schedule)
</span><del>-        self.patch(config, &quot;SyncTokenLifetimeDays&quot;, 0)
</del><ins>+        self.patch(config.RevisionCleanup, &quot;SyncTokenLifetimeDays&quot;, 0)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span></span></pre>
</div>
</div>

</body>
</html>