<!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>[13197] 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/13197">13197</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 09:31:32 -0700 (Tue, 08 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make sure all transactions have meaningful labels set. Fix missing commit causing server hang when txn timeout logging is present.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryaugmentpy">CalendarServer/trunk/twistedcaldav/directory/augment.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipmailgatewaypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/mailgateway.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradepy">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.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="#CalendarServertrunktxdavwhoaugmentpy">CalendarServer/trunk/txdav/who/augment.py</a></li>
<li><a href="#CalendarServertrunktxdavwhodelegatespy">CalendarServer/trunk/txdav/who/delegates.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectoryaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/augment.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/twistedcaldav/directory/augment.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><span class="cx">         self.cachedRecords.clear()
</span><del>-        return succeed(None)
</del><ins>+        return None
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def clean(self):
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx">             log.error(&quot;Failed to parse XML augments file during cache refresh - ignoring&quot;)
</span><span class="cx">         self.lastCached = time.time()
</span><span class="cx"> 
</span><del>-        return succeed(None)
</del><ins>+        return None
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def clean(self):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/upgrade.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -746,7 +746,6 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def upgradeData(config, directory):
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     triggerPath = os.path.join(config.ServerRoot, TRIGGER_FILE)
</span><span class="cx">     if os.path.exists(triggerPath):
</span><span class="cx">         try:
</span><span class="lines">@@ -1008,15 +1007,17 @@
</span><span class="cx">             log.warn(&quot;Migrated %d auto-schedule settings&quot; % (len(augmentRecords),))
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def loadDelegatesFromXML(xmlFile, service):
</span><span class="cx">     loader = XMLCalendarUserProxyLoader(xmlFile, service)
</span><span class="cx">     return loader.updateProxyDB()
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def migrateDelegatesToStore(service, store):
</span><span class="cx">     directory = store.directoryService()
</span><del>-    txn = store.newTransaction()
</del><ins>+    txn = store.newTransaction(label=&quot;migrateDelegatesToStore&quot;)
</ins><span class="cx">     for groupName, memberUID in (
</span><span class="cx">         yield service.query(
</span><span class="cx">             &quot;select GROUPNAME, MEMBER from GROUPS&quot;
</span><span class="lines">@@ -1128,7 +1129,6 @@
</span><span class="cx">             else:
</span><span class="cx">                 sqliteProxyService = None
</span><span class="cx"> 
</span><del>-
</del><span class="cx">             # # Populate the group membership cache
</span><span class="cx">             # if (self.config.GroupCaching.Enabled and
</span><span class="cx">             #     self.config.GroupCaching.EnableUpdater):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipmailgatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/mailgateway.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/mailgateway.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/mailgateway.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">     @type store: L{CommonDataStore}
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     oldDB = MailGatewayTokensDatabase(path)
</span><del>-    txn = store.newTransaction()
</del><ins>+    txn = store.newTransaction(label=&quot;migrateTokensToStore&quot;)
</ins><span class="cx">     for token, organizer, attendee, icaluid in oldDB.getAllTokens():
</span><span class="cx">         yield txn.imipCreateToken(organizer, attendee, icaluid, token=token)
</span><span class="cx">     yield txn.commit()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -444,6 +444,7 @@
</span><span class="cx">         if self.delayedTimeout:
</span><span class="cx">             self.delayedTimeout.cancel()
</span><span class="cx">             self.delayedTimeout = None
</span><ins>+        return succeed(None)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def _installLogTimer(self):
</span><span class="lines">@@ -503,6 +504,9 @@
</span><span class="cx">         notifierFactories, label, migrating=False, disableCache=False,
</span><span class="cx">         authz_uid=None,
</span><span class="cx">     ):
</span><ins>+        if label == &quot;unlabeled&quot; or not label:
+            raise AssertionError(&quot;Please make sure your transactions have a proper label&quot;)
+
</ins><span class="cx">         self._store = store
</span><span class="cx">         self._calendarHomes = {}
</span><span class="cx">         self._addressbookHomes = {}
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def stepWithResult(self, result):
</span><del>-        sqlTxn = self.sqlStore.newTransaction()
</del><ins>+        sqlTxn = self.sqlStore.newTransaction(label=&quot;UpgradeAcquireLockStep.stepWithResult&quot;)
</ins><span class="cx">         yield sqlTxn.acquireUpgradeLock()
</span><span class="cx">         yield sqlTxn.commit()
</span><span class="cx"> 
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def stepWithResult(self, result):
</span><del>-        sqlTxn = self.sqlStore.newTransaction()
</del><ins>+        sqlTxn = self.sqlStore.newTransaction(label=&quot;UpgradeReleaseLockStep.stepWithResult&quot;)
</ins><span class="cx">         yield sqlTxn.releaseUpgradeLock()
</span><span class="cx">         yield sqlTxn.commit()
</span><span class="cx"> 
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">             self.log.warn(&quot;Required database key %s: %s.&quot; % (self.versionKey, required_version,))
</span><span class="cx"> 
</span><span class="cx">         # Get the schema version in the current database
</span><del>-        sqlTxn = self.sqlStore.newTransaction()
</del><ins>+        sqlTxn = self.sqlStore.newTransaction(label=&quot;UpgradeDatabaseCoreStep.getVersions&quot;)
</ins><span class="cx">         dialect = sqlTxn.dialect
</span><span class="cx">         try:
</span><span class="cx">             actual_version = yield sqlTxn.calendarserverValue(self.versionKey)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworkinbox_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def scheduleFirstInboxCleanup(store, seconds):
</span><span class="cx">     if config.InboxCleanup.Enabled:
</span><del>-        txn = store.newTransaction()
</del><ins>+        txn = store.newTransaction(label=&quot;scheduleFirstInboxCleanup&quot;)
</ins><span class="cx">         wp = yield InboxCleanupWork._schedule(txn, seconds)
</span><span class="cx">         yield txn.commit()
</span><span class="cx">         returnValue(wp)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def scheduleFirstFindMinRevision(store, seconds):
</span><span class="cx">     if config.RevisionCleanup.Enabled:
</span><del>-        txn = store.newTransaction()
</del><ins>+        txn = store.newTransaction(label=&quot;scheduleFirstFindMinRevision&quot;)
</ins><span class="cx">         wp = yield FindMinValidRevisionWork._schedule(txn, seconds)
</span><span class="cx">         yield txn.commit()
</span><span class="cx">         returnValue(wp)
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/augment.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/augment.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/txdav/who/augment.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -251,7 +251,6 @@
</span><span class="cx">         fields[field] = value
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def _augment(self, record):
</span><span class="cx">         if record is None:
</span><span class="lines">@@ -380,7 +379,7 @@
</span><span class="cx">     def groups(self):
</span><span class="cx">         augmented = []
</span><span class="cx"> 
</span><del>-        txn = self.service._store.newTransaction()
</del><ins>+        txn = self.service._store.newTransaction(label=&quot;AugmentedDirectoryRecord.groups&quot;)
</ins><span class="cx">         groupUIDs = yield txn.groupsFor(self.uid)
</span><span class="cx"> 
</span><span class="cx">         for groupUID in groupUIDs:
</span><span class="lines">@@ -390,6 +389,8 @@
</span><span class="cx">             if groupRecord:
</span><span class="cx">                 augmented.append((yield self.service._augment(groupRecord)))
</span><span class="cx"> 
</span><ins>+        yield txn.commit()
+
</ins><span class="cx">         returnValue(augmented)
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhodelegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/delegates.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/delegates.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/txdav/who/delegates.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -66,9 +66,9 @@
</span><span class="cx">         the members will consist of the records who have delegated *to*
</span><span class="cx">         this record.
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        parentUID, proxyType = self.uid.split(u&quot;#&quot;)
</del><ins>+        parentUID, _ignore_proxyType = self.uid.split(u&quot;#&quot;)
</ins><span class="cx"> 
</span><del>-        txn = self.service._store.newTransaction()
</del><ins>+        txn = self.service._store.newTransaction(label=&quot;DirectoryRecord.members&quot;)
</ins><span class="cx"> 
</span><span class="cx">         if self.recordType in (
</span><span class="cx">             RecordType.readDelegateGroup, RecordType.writeDelegateGroup
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx">         returnValue(records)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def setMembers(self, memberRecords):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -109,7 +108,7 @@
</span><span class="cx">         ):
</span><span class="cx">             raise NotAllowedError(&quot;Setting members not supported&quot;)
</span><span class="cx"> 
</span><del>-        parentUID, proxyType = self.uid.split(u&quot;#&quot;)
</del><ins>+        parentUID, _ignore_proxyType = self.uid.split(u&quot;#&quot;)
</ins><span class="cx">         readWrite = (self.recordType is RecordType.writeDelegateGroup)
</span><span class="cx"> 
</span><span class="cx">         log.debug(
</span><span class="lines">@@ -118,7 +117,7 @@
</span><span class="cx">             m=[r.uid for r in memberRecords]
</span><span class="cx">         )
</span><span class="cx"> 
</span><del>-        txn = self.service._store.newTransaction()
</del><ins>+        txn = self.service._store.newTransaction(label=&quot;DirectoryRecord.setMembers&quot;)
</ins><span class="cx"> 
</span><span class="cx">         yield txn.removeDelegates(parentUID, readWrite)
</span><span class="cx">         yield txn.removeDelegateGroups(parentUID, readWrite)
</span><span class="lines">@@ -143,6 +142,7 @@
</span><span class="cx">     }.get(recordType, None)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def proxyTypeToRecordType(proxyType):
</span><span class="cx">     return {
</span><span class="cx">         &quot;calendar-proxy-read&quot;: RecordType.readDelegateGroup,
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     if delegate.recordType == BaseRecordType.group:
</span><span class="cx">         # find the groupID
</span><del>-        groupID, name, membershipHash, modified = yield txn.groupByUID(
</del><ins>+        groupID, _ignore_name, _ignore_membershipHash, _ignore_modified = yield txn.groupByUID(
</ins><span class="cx">             delegate.uid
</span><span class="cx">         )
</span><span class="cx">         yield txn.addDelegateGroup(delegator.uid, groupID, readWrite)
</span><span class="lines">@@ -238,6 +238,7 @@
</span><span class="cx">         yield txn.addDelegate(delegator.uid, delegate.uid, readWrite)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def removeDelegate(txn, delegator, delegate, readWrite):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="lines">@@ -253,7 +254,7 @@
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     if delegate.recordType == BaseRecordType.group:
</span><span class="cx">         # find the groupID
</span><del>-        groupID, name, membershipHash, modified = yield txn.groupByUID(
</del><ins>+        groupID, _ignore_name, _ignore_membershipHash, _ignore_modified = yield txn.groupByUID(
</ins><span class="cx">             delegate.uid
</span><span class="cx">         )
</span><span class="cx">         yield txn.removeDelegateGroup(delegator.uid, groupID, readWrite)
</span><span class="lines">@@ -261,6 +262,7 @@
</span><span class="cx">         yield txn.removeDelegate(delegator.uid, delegate.uid, readWrite)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def delegatesOf(txn, delegator, readWrite, expanded=False):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="lines">@@ -287,6 +289,7 @@
</span><span class="cx">     returnValue(records)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def delegatedTo(txn, delegate, readWrite):
</span><span class="cx">     &quot;&quot;&quot;
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py        2014-04-08 16:28:26 UTC (rev 13196)
+++ CalendarServer/trunk/txdav/who/groups.py        2014-04-08 16:31:32 UTC (rev 13197)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> 
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def scheduleNextGroupCachingUpdate(store, seconds):
</span><del>-    txn = store.newTransaction()
</del><ins>+    txn = store.newTransaction(label=&quot;scheduleNextGroupCachingUpdate&quot;)
</ins><span class="cx">     notBefore = (
</span><span class="cx">         datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds)
</span><span class="cx">     )
</span><span class="lines">@@ -174,7 +174,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> def diffAssignments(old, new):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Compare two proxy assignment lists and return their differences in the form
</span><span class="lines">@@ -267,11 +266,11 @@
</span><span class="cx">             ) in changed:
</span><span class="cx">                 readDelegateGroupID = writeDelegateGroupID = None
</span><span class="cx">                 if readDelegateUID:
</span><del>-                    readDelegateGroupID, _ignore_name, hash, modified = (
</del><ins>+                    readDelegateGroupID, _ignore_name, hash, _ignore_modified = (
</ins><span class="cx">                         yield txn.groupByUID(readDelegateUID)
</span><span class="cx">                     )
</span><span class="cx">                 if writeDelegateUID:
</span><del>-                    writeDelegateGroupID, _ignore_name, hash, modified = (
</del><ins>+                    writeDelegateGroupID, _ignore_name, hash, _ignore_modified = (
</ins><span class="cx">                         yield txn.groupByUID(writeDelegateUID)
</span><span class="cx">                     )
</span><span class="cx">                 yield txn.assignExternalDelegates(
</span><span class="lines">@@ -305,7 +304,7 @@
</span><span class="cx">             for member in members:
</span><span class="cx">                 membershipHashContent.update(str(member.uid))
</span><span class="cx">             membershipHash = membershipHashContent.hexdigest()
</span><del>-            groupID, _ignore_cachedName, cachedMembershipHash, modified = (
</del><ins>+            groupID, _ignore_cachedName, cachedMembershipHash, _ignore_modified = (
</ins><span class="cx">                 yield txn.groupByUID(groupUID)
</span><span class="cx">             )
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>