[CalendarServer-changes] [952] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Jan 5 17:44:07 PST 2007


Revision: 952
          http://trac.macosforge.org/projects/calendarserver/changeset/952
Author:   dreid at apple.com
Date:     2007-01-05 17:44:07 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Use a new server that implements privilegedStartService so our logfiles are both owned by root

Modified Paths:
--------------
    CalendarServer/trunk/conf/launchd.plist
    CalendarServer/trunk/twisted/plugins/caldav.py
    CalendarServer/trunk/twistedcaldav/tap.py

Modified: CalendarServer/trunk/conf/launchd.plist
===================================================================
--- CalendarServer/trunk/conf/launchd.plist	2007-01-06 01:00:11 UTC (rev 951)
+++ CalendarServer/trunk/conf/launchd.plist	2007-01-06 01:44:07 UTC (rev 952)
@@ -49,11 +49,5 @@
 
   <key>KeepAlive</key>
   <true/>
-
-  <key>StandardOutPath</key>
-  <string>/var/log/caldavd/server.log</string>
-
-  <key>StandardErrorPath</key>
-  <string>/var/log/caldavd/error.log</string>
 </dict>
 </plist>

Modified: CalendarServer/trunk/twisted/plugins/caldav.py
===================================================================
--- CalendarServer/trunk/twisted/plugins/caldav.py	2007-01-06 01:00:11 UTC (rev 951)
+++ CalendarServer/trunk/twisted/plugins/caldav.py	2007-01-06 01:44:07 UTC (rev 952)
@@ -1,3 +1,3 @@
-from twistedcaldav.tap import CaldavServiceMaker
+from twistedcaldav.tap import CalDAVServiceMaker
 
-TwistedCalDAV = CaldavServiceMaker()
+TwistedCalDAV = CalDAVServiceMaker()

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2007-01-06 01:00:11 UTC (rev 951)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2007-01-06 01:44:07 UTC (rev 952)
@@ -38,7 +38,6 @@
 from twisted.web2.auth.digest import DigestCredentialFactory
 from twisted.web2.channel import http
 
-from twisted.web2.tap import Web2Service
 from twisted.web2.log import LogWrapperResource
 from twisted.web2.server import Site
 
@@ -53,7 +52,22 @@
 except ImportError:
     NegotiateCredentialFactory = None
 
-class CaldavOptions(Options):
+
+class CalDAVService(service.MultiService):
+    def __init__(self, logObserver):
+        self.logObserver = logObserver
+        service.MultiService.__init__(self)
+
+    def privilegedStartService(self):
+        service.MultiService.privilegedStartService(self)
+        self.logObserver.start()
+
+    def stopService(self):
+        service.MultiService.stopService(self)
+        self.logObserver.stop()
+
+
+class CalDAVOptions(Options):
     optParameters = [
         ["config", "f", "/etc/caldavd/caldavd.plist",
          "Path to configuration file."],
@@ -62,7 +76,7 @@
     zsh_actions = {"config" : "_files -g '*.plist'"}
 
     def __init__(self, *args, **kwargs):
-        super(CaldavOptions, self).__init__(*args, **kwargs)
+        super(CalDAVOptions, self).__init__(*args, **kwargs)
 
         self.overrides = {}
 
@@ -109,14 +123,14 @@
         self.parent['pidfile'] = config.PIDFile
 
 
-class CaldavServiceMaker(object):
+class CalDAVServiceMaker(object):
     implements(IPlugin, service.IServiceMaker)
 
     tapname = "caldav"
 
     description = "The Darwin Calendar Server"
 
-    options = CaldavOptions
+    options = CalDAVOptions
 
     #
     # default resource classes
@@ -232,7 +246,7 @@
 
         logObserver = RotatingFileAccessLoggingObserver(config.ServerLogFile)
         
-        service = Web2Service(logObserver)
+        service = CalDAVService(logObserver)
 
         if not config.SSLOnly:
             httpService = internet.TCPServer(int(config.Port), channel)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070105/6dc769c7/attachment.html


More information about the calendarserver-changes mailing list