[CalendarServer-changes] [1220] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1220
          http://trac.macosforge.org/projects/calendarserver/changeset/1220
Author:   dreid at apple.com
Date:     2007-02-20 15:46:02 -0800 (Tue, 20 Feb 2007)

Log Message:
-----------
Don't use pydir++ which stupidly tries to use the poll reactor, and make sure the environment is handed down to the pydirector process.

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd.plist
    CalendarServer/trunk/twistedcaldav/cluster.py

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2007-02-20 19:11:38 UTC (rev 1219)
+++ CalendarServer/trunk/conf/caldavd.plist	2007-02-20 23:46:02 UTC (rev 1220)
@@ -176,7 +176,7 @@
   </dict>
 
   <key>pydirLocation</key>
-  <string>/usr/share/caldavd/bin/pydir++.py</string>
+  <string>/usr/share/caldavd/bin/pydir.py</string>
 
   <key>pydirConfig</key>
   <string>/etc/caldavd/pydir.xml</string>

Modified: CalendarServer/trunk/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cluster.py	2007-02-20 19:11:38 UTC (rev 1219)
+++ CalendarServer/trunk/twistedcaldav/cluster.py	2007-02-20 23:46:02 UTC (rev 1220)
@@ -167,17 +167,21 @@
 
         service.addProcess('pydir', [sys.executable,
                                      config.pydirLocation,
-                                     fname])
+                                     fname],
+                           env=parentEnv)
     
     return service
 
 def makeService_pydir(self, options):
     service = procmon.ProcessMonitor()
 
+    parentEnv = {'PYTHONPATH': os.environ.get('PYTHONPATH', ''),}
+
     log.msg("Adding pydirector service with configuration: %s" % (config.pydirConfig,))
 
     service.addProcess('pydir', [sys.executable,
                                  config.pydirLocation,
-                                 config.pydirConfig])
+                                 config.pydirConfig],
+                       env=parentEnv)
 
     return service

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