[CalendarServer-changes] [2469] CalendarServer/branches/unified-cache/twistedcaldav

[source_changes at macosforge.org]

Revision: 2469
          http://trac.macosforge.org/projects/calendarserver/changeset/2469
Author:   dreid at apple.com
Date:     2008-05-23 16:52:14 -0700 (Fri, 23 May 2008)

Log Message:
-----------
Set up the MemcacheChangeNotifier when Memcache is turned on.

Modified Paths:
--------------
    CalendarServer/branches/unified-cache/twistedcaldav/cache.py
    CalendarServer/branches/unified-cache/twistedcaldav/root.py
    CalendarServer/branches/unified-cache/twistedcaldav/static.py

Modified: CalendarServer/branches/unified-cache/twistedcaldav/cache.py
===================================================================
--- CalendarServer/branches/unified-cache/twistedcaldav/cache.py	2008-05-23 23:46:11 UTC (rev 2468)
+++ CalendarServer/branches/unified-cache/twistedcaldav/cache.py	2008-05-23 23:52:14 UTC (rev 2469)
@@ -55,7 +55,7 @@
 
 
     def _newCacheToken(self):
-        return uuid.uuid4()
+        return str(uuid.uuid4())
 
 
     def changed(self):
@@ -85,7 +85,7 @@
 
 
     def _newCacheToken(self):
-        return uuid.uuid4()
+        return str(uuid.uuid4())
 
 
     def _getMemcacheProtocol(self):
@@ -384,7 +384,8 @@
         for childPath in uri.split('/')[:4]:
             fp = fp.child(childPath)
 
-        return self._getMemcacheProtocol().get('cacheToken:%s' % (fp.path,))
+        return self._getMemcacheProtocol().addCallback(
+            lambda p: p.get('cacheToken:%s' % (fp.path,)))
 
 
     def _getTokens(self, principalURI, requestURI):

Modified: CalendarServer/branches/unified-cache/twistedcaldav/root.py
===================================================================
--- CalendarServer/branches/unified-cache/twistedcaldav/root.py	2008-05-23 23:46:11 UTC (rev 2468)
+++ CalendarServer/branches/unified-cache/twistedcaldav/root.py	2008-05-23 23:52:14 UTC (rev 2469)
@@ -25,8 +25,11 @@
 
 from twistedcaldav.extensions import DAVFile
 from twistedcaldav.config import config
-from twistedcaldav.cache import ResponseCache, _CachedResponseResource, MemcacheResponseCache
+from twistedcaldav.cache import ResponseCache, _CachedResponseResource
+from twistedcaldav.cache import MemcacheResponseCache, MemcacheChangeNotifier
 from twistedcaldav.log import Logger
+from twistedcaldav.static import CalendarHomeFile
+from twistedcaldav.directory.principal import DirectoryPrincipalResource
 
 log = Logger()
 
@@ -58,6 +61,9 @@
                 config.Memcached['BindAddress'],
                 config.Memcached['Port'])
 
+            CalendarHomeFile.cacheNotifierFactory = MemcacheChangeNotifier
+            DirectoryPrincipalResource.cacheNotifierFactory = MemcacheChangeNotifier
+
         else:
             self.responseCache = ResponseCache(self.fp,
                                                config.ResponseCacheSize)

Modified: CalendarServer/branches/unified-cache/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/unified-cache/twistedcaldav/static.py	2008-05-23 23:46:11 UTC (rev 2468)
+++ CalendarServer/branches/unified-cache/twistedcaldav/static.py	2008-05-23 23:52:14 UTC (rev 2469)
@@ -534,7 +534,7 @@
     """
     Calendar home collection resource.
     """
-    changeNotifierFactory = XattrCacheChangeNotifier
+    cacheNotifierFactory = XattrCacheChangeNotifier
 
     def __init__(self, path, parent, record):
         """
@@ -542,7 +542,7 @@
         """
         CalDAVFile.__init__(self, path)
         DirectoryCalendarHomeResource.__init__(self, parent, record)
-        self.cacheNotifier = self.changeNotifierFactory(self.deadProperties())
+        self.cacheNotifier = self.cacheNotifierFactory(self.deadProperties())
 
     def provisionChild(self, name):
         if config.EnableDropBox:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080523/8454aca6/attachment.htm