[CalendarServer-changes] [5279] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5279
          http://trac.macosforge.org/projects/calendarserver/changeset/5279
Author:   sagen at apple.com
Date:     2010-03-10 09:32:56 -0800 (Wed, 10 Mar 2010)
Log Message:
-----------
When the master process spawns the slaves, it now uses whatever twistd path it itself used.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-03-10 17:31:29 UTC (rev 5278)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-03-10 17:32:56 UTC (rev 5279)
@@ -784,7 +784,7 @@
 
         for p in xrange(0, config.MultiProcess.ProcessCount):
             process = TwistdSlaveProcess(
-                config.Twisted.twistd,
+                sys.argv[0],
                 self.tapname,
                 options["config"],
                 p,
@@ -825,7 +825,7 @@
 
             notificationsArgv = [
                 sys.executable,
-                config.Twisted.twistd,
+                sys.argv[0],
             ]
             if config.UserName:
                 notificationsArgv.extend(("-u", config.UserName))
@@ -847,7 +847,7 @@
 
             mailGatewayArgv = [
                 sys.executable,
-                config.Twisted.twistd,
+                sys.argv[0],
             ]
             if config.UserName:
                 mailGatewayArgv.extend(("-u", config.UserName))
@@ -864,7 +864,7 @@
         self.log_info("Adding task service")
         taskArgv = [
             sys.executable,
-            config.Twisted.twistd,
+            sys.argv[0],
         ]
         if config.UserName:
             taskArgv.extend(("-u", config.UserName))

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-03-10 17:31:29 UTC (rev 5278)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-03-10 17:32:56 UTC (rev 5279)
@@ -476,7 +476,6 @@
 
     # Twisted
     "Twisted": {
-        "twistd": "/usr/share/caldavd/bin/twistd",
         "reactor": "select",
     },
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100310/42a7c7db/attachment.html>