[CalendarServer-changes] [4452] CalendarServer/branches/users/wsanchez/deployment

[source_changes at macosforge.org]

Revision: 4452
          http://trac.macosforge.org/projects/calendarserver/changeset/4452
Author:   sagen at apple.com
Date:     2009-07-10 10:40:06 -0700 (Fri, 10 Jul 2009)
Log Message:
-----------
Adds an expiration time to PROPFIND response cache entries.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist
    CalendarServer/branches/users/wsanchez/deployment/conf/caldavd.plist
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cache.py
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/config.py

Modified: CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist	2009-07-10 16:43:07 UTC (rev 4451)
+++ CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist	2009-07-10 17:40:06 UTC (rev 4452)
@@ -520,5 +520,10 @@
     </array>
   </dict>
 
+  <!-- Response Caching -->
+  <key>ResponseCacheTimeout</key>
+  <integer>240</integer> <!-- in minutes -->
+
+
 </dict>
 </plist>

Modified: CalendarServer/branches/users/wsanchez/deployment/conf/caldavd.plist
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/conf/caldavd.plist	2009-07-10 16:43:07 UTC (rev 4451)
+++ CalendarServer/branches/users/wsanchez/deployment/conf/caldavd.plist	2009-07-10 17:40:06 UTC (rev 4452)
@@ -345,6 +345,9 @@
     <key>EnableTimezoneService</key>
     <true/>
 
+    <!-- Response Caching -->
+    <key>ResponseCacheTimeout</key>
+    <integer>240</integer> <!-- in minutes -->
 
 </dict>
 </plist>

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cache.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cache.py	2009-07-10 16:43:07 UTC (rev 4451)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cache.py	2009-07-10 17:40:06 UTC (rev 4452)
@@ -98,7 +98,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)
 
 
 
@@ -304,7 +304,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/users/wsanchez/deployment/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/config.py	2009-07-10 16:43:07 UTC (rev 4451)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/config.py	2009-07-10 17:40:06 UTC (rev 4452)
@@ -328,7 +328,7 @@
 
     "EnableKeepAlive": True,
 
-    "ResponseCacheTimeout": 30, # Minutes
+    "ResponseCacheTimeout": 240, # Minutes
 }
 
 class Config (object):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090710/2df8b18c/attachment.html>