[CalendarServer-changes] [9691] CalendarServer/trunk/contrib/performance/loadtest/sim.py

[source_changes at macosforge.org]

Revision: 9691
          http://trac.macosforge.org/projects/calendarserver/changeset/9691
Author:   dre at apple.com
Date:     2012-08-13 10:18:41 -0700 (Mon, 13 Aug 2012)
Log Message:
-----------
Fix client sim web admin when running in parallel mode

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/loadtest/sim.py

Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/sim.py	2012-08-13 16:41:28 UTC (rev 9690)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py	2012-08-13 17:18:41 UTC (rev 9691)
@@ -244,7 +244,6 @@
             configTemplate = None
             server = 'http://127.0.0.1:8008'
             principalPathTemplate = "/principals/users/%s/"
-            webadminPort = None
             serializationPath = None
 
             if 'server' in config:
@@ -253,9 +252,6 @@
             if 'principalPathTemplate' in config:
                 principalPathTemplate = config['principalPathTemplate']
 
-            if 'webadmin' in config:
-                if config['webadmin']['enabled']:
-                    webadminPort = config['webadmin']['HTTPPort']
 
             if 'clientDataSerialization' in config:
                 if config['clientDataSerialization']['Enabled']:
@@ -289,7 +285,6 @@
             # Manager / observer process.
             server = ''
             principalPathTemplate = ''
-            webadminPort = None
             serializationPath = None
             arrival = None
             parameters = None
@@ -297,6 +292,11 @@
             configTemplate = config
             workerCount = 1
 
+        webadminPort = None
+        if 'webadmin' in config:
+            if config['webadmin']['enabled']:
+                webadminPort = config['webadmin']['HTTPPort']
+
         observers = []
         if 'observers' in config:
             for observer in config['observers']:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120813/063589a9/attachment.html>