[rhmessaging-commits] rhmessaging commits: r1926 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-04-17 12:00:34 -0400 (Thu, 17 Apr 2008)
New Revision: 1926

Modified:
   mgmt/cumin/python/cumin/exchange.py
   mgmt/cumin/python/cumin/exchange.strings
Log:
Restore message and byte statistics to exchanges.

Improve the receive/route/drop chart.



Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py	2008-04-17 15:48:07 UTC (rev 1925)
+++ mgmt/cumin/python/cumin/exchange.py	2008-04-17 16:00:34 UTC (rev 1926)
@@ -362,11 +362,10 @@
     def __init__(self, app, name):
         super(ExchangeStats, self).__init__(app, name)
 
+        self.add_child(StatSet(app, "messages", "message"))
         self.add_child(StatSet(app, "general", "general"))
 
-        chart = StatValueChart(app, "inout")
-        chart.stats = ("msgReceives", "msgRoutes")
-        chart.mode = "rate"
+        chart = self.ReceiveRouteDropRateChart(app, "recvroutedrop")
         self.add_child(chart)
 
         chart = StatValueChart(app, "producers")
@@ -376,6 +375,17 @@
     def render_title(self, session):
         return "Statistics"
 
+    class ReceiveRouteDropRateChart(StatValueChart):
+        def __init__(self, app, name):
+            super(ExchangeStats.ReceiveRouteDropRateChart, self).__init__ \
+                (app, name)
+
+            self.stats = ("msgReceives", "msgRoutes", "msgDrops")
+            self.mode = "rate"
+
+        def render_title(self, session, exchange):
+            return "Received, Routed, and Dropped Messages per Second"
+
 class ExchangeProducerSet(ItemSet):
     def get_args(self, session):
         return self.frame.get_args(session)

Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings	2008-04-17 15:48:07 UTC (rev 1925)
+++ mgmt/cumin/python/cumin/exchange.strings	2008-04-17 16:00:34 UTC (rev 1926)
@@ -201,11 +201,14 @@
 <table class="layout">
   <tr>
     <td class="twocol">
+      <h2>Messages</h2>
+      {messages}
+
       <h2>General</h2>
       {general}
     </td>
     <td class="twocol">
-      {inout}
+      {recvroutedrop}
       {producers}
     </td>
   </tr>