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

[source_changes at macosforge.org]

Revision: 3954
          http://trac.macosforge.org/projects/calendarserver/changeset/3954
Author:   wsanchez at apple.com
Date:     2009-04-06 14:45:44 -0700 (Mon, 06 Apr 2009)
Log Message:
-----------
cleanup

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	2009-04-03 21:56:56 UTC (rev 3953)
+++ CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup	2009-04-06 21:45:44 UTC (rev 3954)
@@ -158,9 +158,9 @@
 def main():
     try:
         (optargs, args) = getopt(
-            sys.argv[1:], "hf:o:aH:r:u:", [
+            sys.argv[1:], "hf:aH:r:u:", [
                 "config=",
-                "output=",
+                "log=",
                 "help",
                 "all", "home=", "record=", "user=",
                 "no-icalendar", "no-properties", "no-index",
@@ -170,7 +170,7 @@
         usage(e)
 
     configFileName = None
-    outputFileName = None
+    logFileName = "/dev/stdout"
 
     directory = None
     calendarHomePaths = set()
@@ -180,9 +180,6 @@
     readProperties = True
     readIndexes = True
 
-    observer = log.FileLogObserver(open("/dev/stdout", "a"))
-    log.addObserver(observer.emit)
-
     def checkExists(resource):
         if not resource.exists():
             sys.stderr.write("No such file: %s\n" % (resource.fp.path,))
@@ -195,6 +192,9 @@
         elif opt in ("-f", "--config"):
             configFileName = arg
 
+        elif opt in ("--log",):
+            logFileName = arg
+
         elif opt in ("-a", "--all"):
             allRecords = True
 
@@ -227,6 +227,9 @@
     if args:
         usage("Too many arguments: %s" % (" ".join(args),))
 
+    observer = log.FileLogObserver(open(logFileName, "a"))
+    log.addObserver(observer.emit)
+
     if records or allRecords or calendarHomePaths:
         loadConfig(configFileName)
         directory = getDirectory()
@@ -239,10 +242,18 @@
 
             record = directory.recordWithGUID(guid)
             if record is None:
-                record = dummyDirectoryRecord
+                record = DirectoryRecord(
+                    service = DummyDirectoryService(),
+                    recordType = "dummy",
+                    guid = guid,
+                    shortName = "dummy",
+                    fullName = "",
+                    calendarUserAddresses = set(),
+                    autoSchedule = False,
+                )
 
             parent = CalDAVFile(dirname(abspath(path)))
-            calendarHome = CalendarHomeFile(arg, parent, record)
+            calendarHome = CalendarHomeFile(path, parent, record)
             checkExists(calendarHome)
             calendarHomes.add(calendarHome)
 
@@ -301,7 +312,7 @@
                 #
                 # Add calendar to F/B set
                 #
-                if calendarHome.record == dummyDirectoryRecord:
+                if calendarHome.record.recordType is dummyDirectoryRecord:
                     log.err("Unable to edit F/B info for %s" % (calendarHome,))
                     continue
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090406/67cd1b4a/attachment.html>