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

[source_changes at macosforge.org]

Revision: 9862
          http://trac.calendarserver.org//changeset/9862
Author:   wsanchez at apple.com
Date:     2012-09-26 13:44:45 -0700 (Wed, 26 Sep 2012)
Log Message:
-----------
Print an error message without a traceback when we have a configuration error, then exit.
Fixes #149.

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

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2012-09-26 20:13:54 UTC (rev 9861)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2012-09-26 20:44:45 UTC (rev 9862)
@@ -344,22 +344,21 @@
     opt_o = opt_option
 
     def postOptions(self):
-        self.loadConfiguration()
-        self.checkConfiguration()
+        try:
+            self.loadConfiguration()
+            self.checkConfiguration()
+        except ConfigurationError, e:
+            print "Invalid configuration: %s" % (e,)
+            sys.exit(1)
 
     def loadConfiguration(self):
         if not os.path.exists(self["config"]):
-            print "Config file %s not found. Exiting." % (self["config"],)
-            sys.exit(1)
+            raise ConfigurationError("Config file %s not found. Exiting."
+                                     % (self["config"],))
 
         print "Reading configuration from file: %s" % (self["config"],)
 
-        try:
-            config.load(self["config"])
-        except ConfigurationError, e:
-            print "Invalid configuration: %s" % (e,)
-            sys.exit(1)
-
+        config.load(self["config"])
         config.updateDefaults(self.overrides)
 
     def checkDirectory(self, dirpath, description, access=None, create=None, wait=False):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120926/86cf2069/attachment-0001.html>