[CalendarServer-changes] [6319] CalendarServer/trunk/contrib/tools

[source_changes at macosforge.org]

Revision: 6319
          http://trac.macosforge.org/projects/calendarserver/changeset/6319
Author:   cdaboo at apple.com
Date:     2010-09-21 09:13:44 -0700 (Tue, 21 Sep 2010)
Log Message:
-----------
Cope with modified format for monitor log.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/tools/monitoranalysis.py
    CalendarServer/trunk/contrib/tools/monitorsplit.py

Modified: CalendarServer/trunk/contrib/tools/monitoranalysis.py
===================================================================
--- CalendarServer/trunk/contrib/tools/monitoranalysis.py	2010-09-20 20:44:47 UTC (rev 6318)
+++ CalendarServer/trunk/contrib/tools/monitoranalysis.py	2010-09-21 16:13:44 UTC (rev 6319)
@@ -67,6 +67,8 @@
                     cpu = int(line[len("CPU idle %: "):].split(" ", 1)[0])
                     
                     line = f.next()
+                    if line.startswith("Memory"):
+                        line = f.next()
                     reqs = int(float(line.split(" ", 1)[0]))
     
                     line = f.next()
@@ -116,7 +118,7 @@
     
     if first:
         plt.legend(('ListenQ at zero', 'ListenQ < 50', 'ListenQ >= 50'),
-               'upper right', shadow=True, fancybox=True)
+               'upper left', shadow=True, fancybox=True)
     if last:
         plt.xlabel("Requests/second")
     plt.ylabel("Av. Response Time (ms)")
@@ -150,7 +152,7 @@
     
     if first:
         plt.legend(('CPU < 1/4', 'CPU < 1/2', 'CPU < 3/4', "CPU High"),
-               'upper right', shadow=True, fancybox=True)
+               'upper left', shadow=True, fancybox=True)
     if last:
         plt.xlabel("Requests/second")
     plt.ylabel("Av. Response Time (ms)")

Modified: CalendarServer/trunk/contrib/tools/monitorsplit.py
===================================================================
--- CalendarServer/trunk/contrib/tools/monitorsplit.py	2010-09-20 20:44:47 UTC (rev 6318)
+++ CalendarServer/trunk/contrib/tools/monitorsplit.py	2010-09-21 16:13:44 UTC (rev 6319)
@@ -54,8 +54,11 @@
             output.append(line)
             try:
                 output.append(f.next())
+                line = f.next()
+                if line.startswith("Memory"):
+                    line = f.next()
+                output.append(line)
                 output.append(f.next())
-                output.append(f.next())
             except StopIteration:
                 break
             outputFile.write("".join(output))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100921/50768c0c/attachment.html>