[CalendarServer-changes] [1361] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 1361
          http://trac.macosforge.org/projects/calendarserver/changeset/1361
Author:   dreid at apple.com
Date:     2007-03-12 16:58:34 -0700 (Mon, 12 Mar 2007)

Log Message:
-----------
Use IServiceMaker.tapname to determine the tap of the child twistd processes

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/cluster.py
    CalendarServer/trunk/twistedcaldav/tap.py

Modified: CalendarServer/trunk/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cluster.py	2007-03-12 23:20:14 UTC (rev 1360)
+++ CalendarServer/trunk/twistedcaldav/cluster.py	2007-03-12 23:58:34 UTC (rev 1361)
@@ -48,9 +48,11 @@
 class TwistdSlaveProcess(object):
     prefix = "caldav"
 
-    def __init__(self, twistd, configFile, interfaces, port, sslPort):
+    def __init__(self, twistd, tapname, configFile, interfaces, port, sslPort):
         self.twistd = twistd
 
+        self.tapname = tapname
+
         self.configFile = configFile
 
         self.port = port
@@ -60,7 +62,7 @@
 
     def getName(self):
         return '%s-%s' % (self.prefix, self.port)
-    
+
     def getSSLName(self):
         return '%s-%s' % (self.prefix, self.sslPort)
 
@@ -70,7 +72,7 @@
             self.twistd,
             '-u', config.UserName,
             '-g', config.GroupName,
-            '-n', 'caldav',
+            '-n', self.tapname,
             '-f', self.configFile,
             '-o', 'ProcessType=Slave',
             '-o', 'BindAddresses=%s' % (','.join(self.interfaces),),
@@ -113,6 +115,7 @@
             sslport += 1
 
         process = TwistdSlaveProcess(config.Twisted['twistd'],
+                                     self.tapname,
                                      options['config'],
                                      bindAddress,
                                      port, sslport)

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2007-03-12 23:20:14 UTC (rev 1360)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2007-03-12 23:58:34 UTC (rev 1361)
@@ -467,7 +467,7 @@
                     interface=bindAddress
                 )
                 httpsService.setServiceParent(service)
-            
+
         return service
 
     makeService_Combined = makeService_Combined

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