[CalendarServer-changes] [4268] CalendarServer/branches/release/CalendarServer-2.2-dev

[source_changes at macosforge.org]

Revision: 4268
          http://trac.macosforge.org/projects/calendarserver/changeset/4268
Author:   wsanchez at apple.com
Date:     2009-05-14 17:43:33 -0700 (Thu, 14 May 2009)
Log Message:
-----------
Pulled up r4264 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-2.2-dev/conf/caldavd-test.plist
    CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/cache.py
    CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/config.py
    CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/directory/appleopendirectory.py

Property Changed:
----------------
    CalendarServer/branches/release/CalendarServer-2.2-dev/


Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4105-4107,4113-4116,4121-4124,4137-4139,4141-4144,4154-4159,4163-4167,4172,4174-4176,4178-4180,4191,4194,4197-4202,4205-4206,4209,4213,4215-4216,4219-4220,4222,4224,4227,4231-4233,4237,4240-4242,4248,4250-4251,4258-4260
   + /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4105-4107,4113-4116,4121-4124,4137-4139,4141-4144,4154-4159,4163-4167,4172,4174-4176,4178-4180,4191,4194,4197-4202,4205-4206,4209,4213,4215-4216,4219-4220,4222,4224,4227,4231-4233,4237,4240-4242,4248,4250-4251,4258-4260,4264

Modified: CalendarServer/branches/release/CalendarServer-2.2-dev/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.2-dev/conf/caldavd-test.plist	2009-05-15 00:41:21 UTC (rev 4267)
+++ CalendarServer/branches/release/CalendarServer-2.2-dev/conf/caldavd-test.plist	2009-05-15 00:43:33 UTC (rev 4268)
@@ -685,7 +685,11 @@
       </array>
     </dict>
 
+    <!-- Response Caching -->
+    <key>ResponseCacheTimeout</key>
+    <integer>30</integer> <!-- in minutes -->
 
+
     <!--
         Twisted
       -->
@@ -721,5 +725,6 @@
       <string>English</string>
     </dict>
 
+
   </dict>
 </plist>

Modified: CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/cache.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/cache.py	2009-05-15 00:41:21 UTC (rev 4267)
+++ CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/cache.py	2009-05-15 00:43:33 UTC (rev 4268)
@@ -29,6 +29,7 @@
 
 from twistedcaldav.log import LoggingMixIn
 from twistedcaldav.memcachepool import CachePoolUserMixIn
+from twistedcaldav.config import config
 
 
 class DisabledCacheNotifier(object):
@@ -78,7 +79,7 @@
         self.log_debug("Changing Cache Token for %r" % (url,))
         return self.getCachePool().set(
             'cacheToken:%s' % (url,),
-            self._newCacheToken())
+            self._newCacheToken(), expireTime=config.ResponseCacheTimeout*60)
 
 
 class BaseResponseCache(LoggingMixIn):
@@ -282,7 +283,8 @@
                   responseBody)))
 
             self.log_debug("Adding to cache: %r = %r" % (key, cacheEntry))
-            return self.getCachePool().set(key, cacheEntry).addCallback(
+            return self.getCachePool().set(key, cacheEntry,
+                expireTime=config.ResponseCacheTimeout*60).addCallback(
                 lambda _: response)
 
         def _cacheResponse((key, responseBody)):

Modified: CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/config.py	2009-05-15 00:41:21 UTC (rev 4267)
+++ CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/config.py	2009-05-15 00:43:33 UTC (rev 4268)
@@ -419,6 +419,8 @@
     },
 
     "EnableKeepAlive": True,
+
+    "ResponseCacheTimeout": 30, # Minutes
 }
 
 class Config (object):

Modified: CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/directory/appleopendirectory.py	2009-05-15 00:41:21 UTC (rev 4267)
+++ CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/directory/appleopendirectory.py	2009-05-15 00:43:33 UTC (rev 4268)
@@ -694,6 +694,12 @@
 
         if record:
             self.log_debug("Storing (%s %s) %s in internal cache" % (indexType, origIndexKey, record))
+
+            # Fetch the set of groups this record is a member of so we can
+            # cache it, rather than have each process make the same group
+            # lookup
+            record._groupMembershipGUIDs = self.groupsForGUID(record.guid)
+
             self.recordCacheForType(recordType).addRecord(record, indexType, origIndexKey)
 
     def _parseResourceInfo(self, plist, guid, recordType, shortname):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090514/d94bc7e2/attachment-0001.html>