[CalendarServer-changes] [5971] CalendarServer/trunk/calendarserver/tap/caldav.py

[source_changes at macosforge.org]

Revision: 5971
          http://trac.macosforge.org/projects/calendarserver/changeset/5971
Author:   sagen at apple.com
Date:     2010-08-03 17:56:23 -0700 (Tue, 03 Aug 2010)
Log Message:
-----------
If the plist is missing or misconfigured, print to stdout; logging isn't fully bootstrapped at this point.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-08-03 20:44:19 UTC (rev 5970)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-08-04 00:56:23 UTC (rev 5971)
@@ -236,16 +236,15 @@
             
     def loadConfiguration(self):
         if not os.path.exists(self["config"]):
-            self.log_info("Config file %s not found, using defaults"
-                          % (self["config"],))
+            print "Config file %s not found. Exiting." % (self["config"],)
+            sys.exit(1)
 
-        self.log_info("Reading configuration from file: %s"
-                      % (self["config"],))
+        print "Reading configuration from file: %s" % (self["config"],)
 
         try:
             config.load(self["config"])
         except ConfigurationError, e:
-            log.err("Invalid configuration: %s" % (e,))
+            print "Invalid configuration: %s" % (e,)
             sys.exit(1)
 
         config.updateDefaults(self.overrides)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100803/171a1f9e/attachment.html>