[CalendarServer-changes] [5975] CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup

[source_changes at macosforge.org]

Revision: 5975
          http://trac.macosforge.org/projects/calendarserver/changeset/5975
Author:   cdaboo at apple.com
Date:     2010-08-04 10:02:19 -0700 (Wed, 04 Aug 2010)
Log Message:
-----------
Fix warmup script for partitioning.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup

Modified: CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup	2010-08-04 14:31:37 UTC (rev 5974)
+++ CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup	2010-08-04 17:02:19 UTC (rev 5975)
@@ -43,6 +43,7 @@
 from twistedcaldav.resource import isPseudoCalendarCollectionResource
 from twistedcaldav.static import CalDAVFile, CalendarHomeFile
 from twistedcaldav.config import config, defaultConfigFile
+from twistedcaldav.directory import augment
 from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
 
 def loadConfig(configFileName):
@@ -58,6 +59,17 @@
     return config
 
 def getDirectory():
+    #
+    # Setup the Augment Service
+    #
+    augmentClass = namedClass(config.AugmentService.type)
+
+    try:
+        augment.AugmentService = augmentClass(**config.AugmentService.params)
+    except IOError, e:
+        print "Could not start augment service"
+        raise
+
     BaseDirectoryService = namedClass(config.DirectoryService["type"])
 
     class MyDirectoryService (BaseDirectoryService):
@@ -120,8 +132,7 @@
     guid = "8EF0892F-7CB6-4B8E-B294-7C5A5321136A",
     shortName = "dummy",
     fullName = "Dummy McDummerson",
-    calendarUserAddresses = set(),
-    autoSchedule = False,
+    emailAddresses = (),
 )
 
 class UsageError (StandardError):
@@ -251,8 +262,7 @@
                     guid = guid,
                     shortName = "dummy",
                     fullName = "",
-                    calendarUserAddresses = set(),
-                    autoSchedule = False,
+                    emailAddresses = (),
                 )
 
             parent = CalDAVFile(dirname(abspath(path)))
@@ -262,7 +272,11 @@
 
         for record in records:
             recordType, shortName = record
-            calendarHome = directory.calendarHomeForShortName(recordType, shortName)
+            try:
+                calendarHome = directory.calendarHomeForShortName(recordType, shortName)
+            except Exception, e:
+                log.msg("Exception for calendar home '%s': %s" % (calendarHome, e))
+                calendarHome = None
             if not calendarHome:
                 sys.stderr.write("No calendar home found for record: (%s)%s\n" % (recordType, shortName))
                 sys.exit(1)
@@ -270,7 +284,11 @@
 
         if allRecords:
             for record in directory.allRecords():
-                calendarHome = directory.calendarHomeForRecord(record)
+                try:
+                    calendarHome = directory.calendarHomeForRecord(record)
+                except Exception, e:
+                    log.msg("Exception for calendar home '%s': %s" % (calendarHome, e))
+                    calendarHome = None
                 if not calendarHome:
                     pass
                 else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100804/3b0eeb14/attachment-0001.html>