Skip to content
Permalink
Browse files

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

git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk@1463 e27351fd-9f3e-4f54-a53b-843176b1656c
  • Loading branch information...
dreid committed Apr 10, 2007
1 parent abcfc72 commit 8686dbd18c8f552c3ec3d592972be7b13c68ad98
Showing with 14 additions and 5 deletions.
  1. +4 −1 conf/caldavd-test.plist
  2. +10 −4 twistedcaldav/tap.py
@@ -286,7 +286,7 @@ limitations under the License.
<key>MultiProcess</key>
<dict>
<key>ProcessCount</key>
<integer>4</integer>
<integer>0</integer>

<key>LoadBalancer</key>
<dict>
@@ -349,5 +349,8 @@ limitations under the License.
<string>conf/pydir.xml</string>
</dict>

<key>ControlSocket</key>
<string>logs/caldavd.sock</string>

</dict>
</plist>
@@ -437,11 +437,16 @@ def makeService_Slave(self, options):

channel = http.HTTPFactory(site)

log.msg("Configuring log observer: %s" % (
config.ControlSocket,))
if config.ProcessType == 'Slave':
logObserver = logging.AMPCommonAccessLoggingObserver(
config.ControlSocket)

elif config.ProcessType == 'Single':
logObserver = logging.RotatingFileAccessLoggingObserver(
config.AccessLogFile)

logObserver = logging.AMPCommonAccessLoggingObserver(
config.ControlSocket)
log.msg("Configuring log observer: %s" % (
logObserver,))

service = CalDAVService(logObserver)

@@ -484,6 +489,7 @@ def makeService_Slave(self, options):

makeService_Combined = makeService_Combined
makeService_Master = makeService_Master
makeService_Single = makeService_Slave

def makeService(self, options):
serverType = config.ProcessType

0 comments on commit 8686dbd

Please sign in to comment.
You can’t perform that action at this time.