[CalendarServer-changes] [3833] CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py

[source_changes at macosforge.org]

Revision: 3833
          http://trac.macosforge.org/projects/calendarserver/changeset/3833
Author:   sagen at apple.com
Date:     2009-03-11 17:51:36 -0700 (Wed, 11 Mar 2009)
Log Message:
-----------
Added logging for the new conditional proxy db cleaning

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

Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2009-03-12 00:29:36 UTC (rev 3832)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2009-03-12 00:51:36 UTC (rev 3833)
@@ -39,6 +39,7 @@
 from twistedcaldav.resource import CalDAVComplianceMixIn
 from twistedcaldav.directory.util import NotFilePath
 from twistedcaldav.sql import AbstractSQLDatabase, db_prefix
+from twistedcaldav.log import LoggingMixIn
 
 import itertools
 import os
@@ -347,7 +348,6 @@
 
             # Clean-up ones that are missing
             for uid in missing:
-                self.log_debug("Removing missing proxy principal for '%s' from %s" % (uid, self,))
                 cacheTimeout = config.DirectoryService.params.get("cacheTimeout", 30) * 60 # in seconds
 
                 yield self._index().removePrincipal(uid,
@@ -376,7 +376,7 @@
     def hasEditableMembership(self):
         return self.parent.hasEditableProxyMembership()
 
-class CalendarUserProxyDatabase(AbstractSQLDatabase):
+class CalendarUserProxyDatabase(AbstractSQLDatabase, LoggingMixIn):
     """
     A database to maintain calendar user proxy group memberships.
 
@@ -537,9 +537,14 @@
 
             elif overdue is None:
                 # No timer was previously set
+                self.log_debug("Delaying removal of missing proxy principal '%s'" %
+                    (principalUID,))
                 self._memcacher.setDeletionTimer(principalUID, delay=delay)
                 returnValue(None)
 
+        self.log_debug("Removing missing proxy principal for '%s'" %
+            (principalUID,))
+
         for suffix in ("calendar-proxy-read", "calendar-proxy-write",):
             groupUID = "%s#%s" % (principalUID, suffix,)
             self._delete_from_db(groupUID)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090311/15c02223/attachment.html>