Revision: 3611 http://trac.macosforge.org/projects/calendarserver/changeset/3611 Author: wsanchez@apple.com Date: 2009-01-26 16:31:10 -0800 (Mon, 26 Jan 2009) Log Message: ----------- Exit on invalid config. Modified Paths: -------------- CalendarServer/trunk/calendarserver/tap/caldav.py Modified: CalendarServer/trunk/calendarserver/tap/caldav.py =================================================================== --- CalendarServer/trunk/calendarserver/tap/caldav.py 2009-01-26 16:48:32 UTC (rev 3610) +++ CalendarServer/trunk/calendarserver/tap/caldav.py 2009-01-27 00:31:10 UTC (rev 3611) @@ -190,8 +190,13 @@ self.log_info("Reading configuration from file: %s" % (self["config"],)) - config.loadConfig(self["config"]) + try: + config.loadConfig(self["config"]) + except ConfigurationError, e: + log.err("Invalid configuration: %s" % (e,)) + sys.exit(1) + config.updateDefaults(self.overrides) uid, gid = None, None