[CalendarServer-changes] [1250] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1250
          http://trac.macosforge.org/projects/calendarserver/changeset/1250
Author:   wsanchez at apple.com
Date:     2007-02-23 11:00:48 -0800 (Fri, 23 Feb 2007)

Log Message:
-----------
ServerType -> ProcessType

Modified Paths:
--------------
    CalendarServer/trunk/bin/caldavd
    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
    CalendarServer/trunk/twistedcaldav/tap.py

Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd	2007-02-23 04:45:47 UTC (rev 1249)
+++ CalendarServer/trunk/bin/caldavd	2007-02-23 19:00:48 UTC (rev 1250)
@@ -103,7 +103,7 @@
         'u') username="-u ${OPTARG}"; ;;
         'g') groupname="-g ${OPTARG}"; ;;
         'P') plugin_name="${OPTARG}"; ;;
-        't') service_type="-o ServerType=${OPTARG}"; ;;
+        't') service_type="-o ProcessType=${OPTARG}"; ;;
     esac;
 done;
 

Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 04:45:47 UTC (rev 1249)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 19:00:48 UTC (rev 1250)
@@ -196,7 +196,7 @@
   <key>SudoersFile</key>
   <string>conf/sudoers.plist</string>
   
-  <key>ServerType</key>
+  <key>ProcessType</key>
   <string>singleprocess</string>
   
   <key>MultiProcess</key>

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 04:45:47 UTC (rev 1249)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 19:00:48 UTC (rev 1250)
@@ -196,7 +196,7 @@
   <key>SudoersFile</key>
   <string>conf/sudoers.plist</string>
   
-  <key>ServerType</key>
+  <key>ProcessType</key>
   <string>singleprocess</string>
   
   <key>MultiProcess</key>

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2007-02-23 04:45:47 UTC (rev 1249)
+++ CalendarServer/trunk/conf/caldavd.plist	2007-02-23 19:00:48 UTC (rev 1250)
@@ -148,7 +148,7 @@
 
   <key>SudoersFile</key>
   <string>/etc/caldavd/sudoers.plist</string>
-  <key>ServerType</key>
+  <key>ProcessType</key>
   <string>multiprocess</string>
   
   <key>MultiProcess</key>

Modified: CalendarServer/trunk/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cluster.py	2007-02-23 04:45:47 UTC (rev 1249)
+++ CalendarServer/trunk/twistedcaldav/cluster.py	2007-02-23 19:00:48 UTC (rev 1250)
@@ -72,7 +72,7 @@
             '-g', config.GroupName,
             '-n', 'caldav',
             '-f', self.configFile,
-            '-o', 'ServerType=slave',
+            '-o', 'ProcessType=slave',
             '-o', 'BindAddresses=%s' % (','.join(self.interfaces),),
             '-o', 'BindHTTPPorts=%s' % (self.port,),
             '-o', 'BindSSLPorts=%s' % (self.sslPort,),

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 04:45:47 UTC (rev 1249)
+++ CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 19:00:48 UTC (rev 1250)
@@ -101,7 +101,7 @@
     #
     "UserName": "daemon",
     "GroupName": "daemon",
-    "ServerType": "singleprocess",
+    "ProcessType": "singleprocess",
     "MultiProcess": {
         "NumProcesses": 10,
         "LoadBalancer": {

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2007-02-23 04:45:47 UTC (rev 1249)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2007-02-23 19:00:48 UTC (rev 1250)
@@ -178,7 +178,7 @@
         # Nuke the file log observer's time format.
         #
 
-        if not config.ErrorLogFile and config.ServerType == 'slave':
+        if not config.ErrorLogFile and config.ProcessType == 'slave':
             log.FileLogObserver.timeFormat = ''
         
         
@@ -468,7 +468,7 @@
     makeService_master       = makeService_pydir
 
     def makeService(self, options):
-        serverType = config.ServerType
+        serverType = config.ProcessType
         
         serviceMethod = getattr(self, "makeService_%s" % (serverType,), None)
 

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