Revision: 1463 http://trac.macosforge.org/projects/calendarserver/changeset/1463 Author: dreid@apple.com Date: 2007-04-10 11:34:03 -0700 (Tue, 10 Apr 2007) Log Message: ----------- Add a Single processtype that uses only a single process make the default in the caldavd-test.plist be ProcessCount = 0, so we autodetect. Add the ControlSocket in logs/caldavd.sock to caldavd-test.plist Modified Paths: -------------- CalendarServer/trunk/conf/caldavd-test.plist CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/conf/caldavd-test.plist =================================================================== --- CalendarServer/trunk/conf/caldavd-test.plist 2007-04-10 17:52:35 UTC (rev 1462) +++ CalendarServer/trunk/conf/caldavd-test.plist 2007-04-10 18:34:03 UTC (rev 1463) @@ -286,7 +286,7 @@ <key>MultiProcess</key> <dict> <key>ProcessCount</key> - <integer>4</integer> + <integer>0</integer> <key>LoadBalancer</key> <dict> @@ -349,5 +349,8 @@ <string>conf/pydir.xml</string> </dict> + <key>ControlSocket</key> + <string>logs/caldavd.sock</string> + </dict> </plist> Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2007-04-10 17:52:35 UTC (rev 1462) +++ CalendarServer/trunk/twistedcaldav/tap.py 2007-04-10 18:34:03 UTC (rev 1463) @@ -437,12 +437,17 @@ channel = http.HTTPFactory(site) + if config.ProcessType == 'Slave': + logObserver = logging.AMPCommonAccessLoggingObserver( + config.ControlSocket) + + elif config.ProcessType == 'Single': + logObserver = logging.RotatingFileAccessLoggingObserver( + config.AccessLogFile) + log.msg("Configuring log observer: %s" % ( - config.ControlSocket,)) + logObserver,)) - logObserver = logging.AMPCommonAccessLoggingObserver( - config.ControlSocket) - service = CalDAVService(logObserver) if not config.BindAddresses: @@ -484,6 +489,7 @@ makeService_Combined = makeService_Combined makeService_Master = makeService_Master + makeService_Single = makeService_Slave def makeService(self, options): serverType = config.ProcessType