[CalendarServer-changes] [5428] CalendarServer/branches/users/glyph/deployment-plus-sendfd/ twistedcaldav/cluster.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 31 10:55:24 PDT 2010


Revision: 5428
          http://trac.macosforge.org/projects/calendarserver/changeset/5428
Author:   glyph at apple.com
Date:     2010-03-31 10:55:24 -0700 (Wed, 31 Mar 2010)
Log Message:
-----------
use ID as port number in metaFD case as well

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/deployment-plus-sendfd/twistedcaldav/cluster.py

Modified: CalendarServer/branches/users/glyph/deployment-plus-sendfd/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/branches/users/glyph/deployment-plus-sendfd/twistedcaldav/cluster.py	2010-03-31 17:23:13 UTC (rev 5427)
+++ CalendarServer/branches/users/glyph/deployment-plus-sendfd/twistedcaldav/cluster.py	2010-03-31 17:55:24 UTC (rev 5428)
@@ -199,7 +199,7 @@
         if ssl and self.sslPorts is not None:
             port = self.sslPorts
 
-        if self.inheritFDs or self.inheritSSLFDs:
+        if self.inheritFDs or self.inheritSSLFDs or self.dispatcher:
             port = [self.id]
 
         if port is None:
@@ -497,6 +497,8 @@
             sslPort = None
 
         if config.UseMetaFD:
+            port = None
+            sslPort = None
             extraArgs = dict(dispatcher=cl.dispatcher)
         else:
             extraArgs = dict(inheritFDs=inheritFDs,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100331/a9469245/attachment.html>


More information about the calendarserver-changes mailing list