Revision: 4370
http://trac.macosforge.org/projects/calendarserver/changeset/4370
Author: sagen at apple.com
Date: 2009-06-23 11:15:45 -0700 (Tue, 23 Jun 2009)
Log Message:
-----------
Don't bother trying to reload passwords during -HUP because non-root processes can't look them up.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/config.py
Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py 2009-06-23 17:17:00 UTC (rev 4369)
+++ CalendarServer/trunk/twistedcaldav/config.py 2009-06-23 18:15:45 UTC (rev 4370)
@@ -637,6 +637,7 @@
raise AttributeError(attr)
def reload(self):
+ self._reloading = True
log.info("Reloading configuration from file: %s" % (self._configFile,))
self._data = copy.deepcopy(self._defaults)
self.loadConfig(self._configFile)
@@ -658,6 +659,11 @@
#
# Notifications
#
+
+ # Reloading not supported -- requires process running as root
+ if getattr(self, "_reloading", False):
+ return
+
for key, service in self.Notifications["Services"].iteritems():
if service["Enabled"]:
self.Notifications["Enabled"] = True
@@ -694,6 +700,11 @@
#
# Scheduling
#
+
+ # Reloading not supported -- requires process running as root
+ if getattr(self, "_reloading", False):
+ return
+
service = self.Scheduling["iMIP"]
if service["Enabled"]:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090623/cb564a12/attachment-0001.html>