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

[source_changes at macosforge.org]

Revision: 4078
          http://trac.macosforge.org/projects/calendarserver/changeset/4078
Author:   cdaboo at apple.com
Date:     2009-04-23 21:21:40 -0700 (Thu, 23 Apr 2009)
Log Message:
-----------
Redo locking hash stuff to be more generic.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/memcachelock.py
    CalendarServer/trunk/twistedcaldav/method/put_common.py
    CalendarServer/trunk/twistedcaldav/test/test_memcachelock.py

Modified: CalendarServer/trunk/twistedcaldav/memcachelock.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/memcachelock.py	2009-04-24 02:11:52 UTC (rev 4077)
+++ CalendarServer/trunk/twistedcaldav/memcachelock.py	2009-04-24 04:21:40 UTC (rev 4078)
@@ -18,7 +18,7 @@
 from twisted.internet.defer import inlineCallbacks, Deferred, returnValue,\
     succeed
 from twisted.internet import reactor
-import base64
+import hashlib
 import time
 
 class MemcacheLock(Memcacher):
@@ -42,7 +42,7 @@
         if isinstance(locktoken, unicode):
             locktoken = locktoken.encode("utf-8")
         assert isinstance(locktoken, str), "Lock token must be a str."
-        self._locktoken = base64.b64encode(locktoken)
+        self._locktoken = hashlib.md5(locktoken).hexdigest()
         self._timeout = timeout
         self._retry_interval = retry_interval
         self._expire_time = expire_time

Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put_common.py	2009-04-24 02:11:52 UTC (rev 4077)
+++ CalendarServer/trunk/twistedcaldav/method/put_common.py	2009-04-24 04:21:40 UTC (rev 4078)
@@ -20,7 +20,6 @@
 
 __all__ = ["StoreCalendarObjectResource"]
 
-import hashlib
 import os
 import types
 import uuid
@@ -150,7 +149,7 @@
             if internal_request:
                 self.lock = None
             else:
-                self.lock = MemcacheLock("ImplicitUIDLock", hashlib.md5(uid).hexdigest(), timeout=60.0)
+                self.lock = MemcacheLock("ImplicitUIDLock", uid, timeout=60.0)
             self.reserved = False
             self.index = index
             self.uid = uid

Modified: CalendarServer/trunk/twistedcaldav/test/test_memcachelock.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_memcachelock.py	2009-04-24 02:11:52 UTC (rev 4077)
+++ CalendarServer/trunk/twistedcaldav/test/test_memcachelock.py	2009-04-24 04:21:40 UTC (rev 4078)
@@ -120,7 +120,7 @@
         lock = MemCacheTestCase.FakedMemcacheLock(self.proto, "lock", "locking")
         yield self._test(
             lock.acquire(),
-            "add lock:bG9ja2luZw== 0 0 1\r\n1\r\n",
+            "add lock:559159aa00cc525bfe5c4b34cf16cccb 0 0 1\r\n1\r\n",
             "STORED\r\n",
             True
         )
@@ -136,7 +136,7 @@
         lock = MemCacheTestCase.FakedMemcacheLock(self.proto, "lock", "locking", timeout=0)
         yield self._test(
             lock.acquire(),
-            "add lock:bG9ja2luZw== 0 0 1\r\n1\r\n",
+            "add lock:559159aa00cc525bfe5c4b34cf16cccb 0 0 1\r\n1\r\n",
             "STORED\r\n",
             True
         )
@@ -153,7 +153,7 @@
         try:
             yield self._test(
                 lock.acquire(),
-                "add lock:bG9ja2luZw== 0 0 1\r\n1\r\n",
+                "add lock:559159aa00cc525bfe5c4b34cf16cccb 0 0 1\r\n1\r\n",
                 "NOT_STORED\r\n",
                 True
             )
@@ -175,14 +175,14 @@
         lock = MemCacheTestCase.FakedMemcacheLock(self.proto, "lock", "locking")
         yield self._test(
             lock.acquire(),
-            "add lock:bG9ja2luZw== 0 0 1\r\n1\r\n",
+            "add lock:559159aa00cc525bfe5c4b34cf16cccb 0 0 1\r\n1\r\n",
             "STORED\r\n",
             True
         )
         self.assertTrue(lock._hasLock)
         yield self._test(
             lock.release(),
-            "delete lock:bG9ja2luZw==\r\n",
+            "delete lock:559159aa00cc525bfe5c4b34cf16cccb\r\n",
             "DELETED\r\n",
             True
         )
@@ -198,13 +198,13 @@
         lock = MemCacheTestCase.FakedMemcacheLock(self.proto, "lock", "locking")
         yield self._test(
             lock.acquire(),
-            "add lock:bG9ja2luZw== 0 0 1\r\n1\r\n",
+            "add lock:559159aa00cc525bfe5c4b34cf16cccb 0 0 1\r\n1\r\n",
             "STORED\r\n",
             True
         )
         yield self._test(
             lock.clean(),
-            "delete lock:bG9ja2luZw==\r\n",
+            "delete lock:559159aa00cc525bfe5c4b34cf16cccb\r\n",
             "DELETED\r\n",
             True
         )
@@ -219,7 +219,7 @@
         lock = MemCacheTestCase.FakedMemcacheLock(self.proto, "lock", u"locking")
         yield self._test(
             lock.acquire(),
-            "add lock:bG9ja2luZw== 0 0 1\r\n1\r\n",
+            "add lock:559159aa00cc525bfe5c4b34cf16cccb 0 0 1\r\n1\r\n",
             "STORED\r\n",
             True
         )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090423/0f47c2d4/attachment.html>