[CalendarServer-changes] [8059] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 8059
          http://trac.macosforge.org/projects/calendarserver/changeset/8059
Author:   cdaboo at apple.com
Date:     2011-09-09 13:37:00 -0700 (Fri, 09 Sep 2011)
Log Message:
-----------
Need ProxyDB memcache keys to sometimes not be normalized.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2011-09-09 15:48:55 UTC (rev 8058)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2011-09-09 20:37:00 UTC (rev 8059)
@@ -390,6 +390,9 @@
     
     class ProxyDBMemcacher(Memcacher):
         
+        def __init__(self, namespace):
+            super(ProxyDB.ProxyDBMemcacher, self).__init__(namespace, key_normalization=config.Memcached.ProxyDBKeyNormalization)
+
         def setMembers(self, guid, members):
             return self.set("members:%s" % (str(guid),), str(",".join(members)))
 

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2011-09-09 15:48:55 UTC (rev 8058)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2011-09-09 20:37:00 UTC (rev 8059)
@@ -742,6 +742,11 @@
 #                   "DIGESTCREDENTIALS",
 #                   "resourceInfoDB",
 #                   "pubsubnodes",
+#                   "FBCache",
+#                   "ScheduleAddressMapper",
+#                   "SQL.props",
+#                   "SQL.calhome",
+#                   "SQL.adbkhome",
                 ]
             },
 #            "Shared": {
@@ -752,17 +757,13 @@
 #                "HandleCacheTypes": [
 #                    "ProxyDB",
 #                    "PrincipalToken",
-#                    "FBCache",
-#                    "ScheduleAddressMapper",
-#                    "SQL.props",
-#                    "SQL.calhome",
-#                    "SQL.adbkhome",
 #                ]
 #            },
         },
         "memcached": "memcached", # Find in PATH
         "MaxMemory": 0, # Megabytes
         "Options": [],
+        "ProxyDBKeyNormalization": True,
     },
 
     "Postgres": {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110909/b30132c6/attachment.html>