[CalendarServer-changes] [1254] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 23 15:33:14 PST 2007
Revision: 1254
http://trac.macosforge.org/projects/calendarserver/changeset/1254
Author: wsanchez at apple.com
Date: 2007-02-23 15:33:14 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
Nest Twisted and PythonDirector options
Modified Paths:
--------------
CalendarServer/trunk/conf/caldavd-test-logged.plist
CalendarServer/trunk/conf/caldavd-test.plist
CalendarServer/trunk/conf/caldavd.plist
CalendarServer/trunk/twistedcaldav/cluster.py
CalendarServer/trunk/twistedcaldav/config.py
Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist 2007-02-23 23:19:09 UTC (rev 1253)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist 2007-02-23 23:33:14 UTC (rev 1254)
@@ -157,9 +157,6 @@
<key>EnableProxyPrincipals</key>
<true/>
- <key>twistdLocation</key>
- <string>../Twisted/bin/twistd</string>
-
<key>EnableSACLs</key>
<false/>
@@ -205,10 +202,13 @@
<integer>2</integer>
</dict>
- <key>pydirLocation</key>
- <string>../pydirector-1.0.0/pydir.py</string>
+ <key>PythonDirector</key>
+ <dict>
+ <key>pydir</key>
+ <string>../pydirector-1.0.0/pydir.py</string>
- <key>pydirConfig</key>
- <string>conf/pydir.xml</string>
+ <key>ConfigFile</key>
+ <string>conf/pydir.xml</string>
+ </dict>
</dict>
</plist>
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2007-02-23 23:19:09 UTC (rev 1253)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2007-02-23 23:33:14 UTC (rev 1254)
@@ -157,9 +157,6 @@
<key>EnableProxyPrincipals</key>
<true/>
- <key>twistdLocation</key>
- <string>../Twisted/bin/twistd</string>
-
<key>EnableSACLs</key>
<false/>
@@ -205,10 +202,13 @@
<integer>2</integer>
</dict>
- <key>pydirLocation</key>
- <string>../pydirector-1.0.0/pydir.py</string>
+ <key>PythonDirector</key>
+ <dict>
+ <key>pydir</key>
+ <string>../pydirector-1.0.0/pydir.py</string>
- <key>pydirConfig</key>
- <string>conf/pydir.xml</string>
+ <key>ConfigFile</key>
+ <string>conf/pydir.xml</string>
+ </dict>
</dict>
</plist>
Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist 2007-02-23 23:19:09 UTC (rev 1253)
+++ CalendarServer/trunk/conf/caldavd.plist 2007-02-23 23:33:14 UTC (rev 1254)
@@ -156,11 +156,5 @@
<key>ProcessCount</key>
<integer>1</integer>
</dict>
-
- <key>pydirLocation</key>
- <string>/usr/share/caldavd/bin/pydir.py</string>
-
- <key>pydirConfig</key>
- <string>/etc/caldavd/pydir.xml</string>
</dict>
</plist>
Modified: CalendarServer/trunk/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cluster.py 2007-02-23 23:19:09 UTC (rev 1253)
+++ CalendarServer/trunk/twistedcaldav/cluster.py 2007-02-23 23:33:14 UTC (rev 1254)
@@ -48,8 +48,8 @@
class TwistdSlaveProcess(object):
prefix = "caldav"
- def __init__(self, twistdLocation, configFile, interfaces, port, sslPort):
- self.twistd = twistdLocation
+ def __init__(self, twistd, configFile, interfaces, port, sslPort):
+ self.twistd = twistd
self.configFile = configFile
@@ -112,7 +112,7 @@
port += 1
sslport += 1
- process = TwistdSlaveProcess(config.twistdLocation,
+ process = TwistdSlaveProcess(config.Twisted['twistd'],
options['config'],
bindAddress,
port, sslport)
@@ -170,7 +170,7 @@
log.msg("Adding pydirector service with configuration: %s" % (fname,))
service.addProcess('pydir', [sys.executable,
- config.pydirLocation,
+ config.PythonDirector['pydir'],
fname],
env=parentEnv)
@@ -181,11 +181,11 @@
parentEnv = {'PYTHONPATH': os.environ.get('PYTHONPATH', ''),}
- log.msg("Adding pydirector service with configuration: %s" % (config.pydirConfig,))
+ log.msg("Adding pydirector service with configuration: %s" % (config.PythonDirector['ConfigFile'],))
service.addProcess('pydir', [sys.executable,
- config.pydirLocation,
- config.pydirConfig],
+ config.PythonDirector['pydir'],
+ config.PythonDirector['ConfigFile']],
env=parentEnv)
return service
Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py 2007-02-23 23:19:09 UTC (rev 1253)
+++ CalendarServer/trunk/twistedcaldav/config.py 2007-02-23 23:33:14 UTC (rev 1254)
@@ -129,11 +129,15 @@
#
# Twisted
- "twistdLocation": "/usr/share/caldavd/bin/twistd",
+ "Twisted": {
+ "twistd": "/usr/share/caldavd/bin/twistd",
+ },
# Python Director
- "pydirLocation": "/usr/share/caldavd/bin/pydir++.py",
- "pydirConfig": "/etc/caldavd/pydir.xml",
+ "PythonDirector": {
+ "pydir": "/usr/share/caldavd/bin/pydir++.py",
+ "ConfigFile": "/etc/caldavd/pydir.xml",
+ },
}
class Config (object):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070223/bae2960c/attachment.html
More information about the calendarserver-changes
mailing list