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

[source_changes at macosforge.org]

Revision: 11869
          http://trac.calendarserver.org//changeset/11869
Author:   cdaboo at apple.com
Date:     2013-11-01 12:14:17 -0700 (Fri, 01 Nov 2013)
Log Message:
-----------
Make sure ampsim also reports server stats socket data.

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

Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/sim.py	2013-11-01 18:02:11 UTC (rev 11868)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py	2013-11-01 19:14:17 UTC (rev 11869)
@@ -346,6 +346,7 @@
         if 'serverStats' in config:
             if config['serverStats']['enabled']:
                 serverStats = config['serverStats']
+                serverStats['server'] = config['server'] if 'server' in config else ''
 
         observers = []
         if 'observers' in config:
@@ -483,7 +484,7 @@
         """
 
         if self.serverStats is not None:
-            _ignore_scheme, hostname, _ignore_path, _ignore_query, _ignore_fragment = urlsplit(self.server)
+            _ignore_scheme, hostname, _ignore_path, _ignore_query, _ignore_fragment = urlsplit(self.serverStats["server"])
             data = self.readStatsSock((hostname.split(":")[0], self.serverStats["Port"],), True)
             if "Failed" not in data:
                 data = data["5 Minutes"]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/835c05fc/attachment.html>