[CalendarServer-changes] [2418] CalendarServer/trunk/twistedcaldav/cache.py

[source_changes at macosforge.org]

Revision: 2418
          http://trac.macosforge.org/projects/calendarserver/changeset/2418
Author:   dreid at apple.com
Date:     2008-05-14 11:25:14 -0700 (Wed, 14 May 2008)

Log Message:
-----------
Log new and old cache tokens on token changes.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/cache.py

Modified: CalendarServer/trunk/twistedcaldav/cache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cache.py	2008-05-14 18:13:01 UTC (rev 2417)
+++ CalendarServer/trunk/twistedcaldav/cache.py	2008-05-14 18:25:14 UTC (rev 2418)
@@ -158,14 +158,23 @@
 
             principalToken, uriToken, accessTime, response = self._responses[key]
 
-            if self._tokenForURI(principalURI) != principalToken:
-                self.log_debug("Principal token changed: %r" % (
-                        key,))
+            newPrincipalToken = self._tokenForURI(principalURI)
+            newURIToken = self._tokenForURI(request.uri)
+
+            if newPrincipalToken != principalToken:
+                self.log_debug("Principal token changed on %r from %r to %r" % (
+                        key,
+                        principalToken,
+                        newPrincipalToken
+                        ))
                 return None
 
-            elif self._tokenForURI(request.uri) != uriToken:
-                self.log_debug("URI token changed: %r" % (
-                        key,))
+            elif newURIToken != uriToken:
+                self.log_debug("URI token changed on %r from %r to %r" % (
+                        key,
+                        uriToken,
+                        newURIToken
+                        ))
                 return None
 
             response[1].removeHeader('date')

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080514/d7bd6f09/attachment-0001.html