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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-01-14 08:20:15 -0500 (Mon, 14 Jan 2008)
New Revision: 1559

Modified:
   mgmt/cumin/python/cumin/client.strings
   mgmt/cumin/python/cumin/exchange.strings
   mgmt/cumin/python/cumin/stat.py
   mgmt/cumin/python/cumin/stat.strings
Log:
Fixes up charts a bit.  Makes the current value display a live-updated
one.



Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings	2008-01-14 04:45:16 UTC (rev 1558)
+++ mgmt/cumin/python/cumin/client.strings	2008-01-14 13:20:15 UTC (rev 1559)
@@ -125,10 +125,10 @@
 </table>
 
 [StatisticsHistory.html]
-<h2>Sent</h2>
+<h2>Bytes Sent</h2>
 <div class="iblock chart">{sent}</div>
 
-<h2>Received</h2>
+<h2>Bytes Received</h2>
 <div class="iblock chart">{received}</div>
 
 [ClientSessionSet.html]

Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings	2008-01-14 04:45:16 UTC (rev 1558)
+++ mgmt/cumin/python/cumin/exchange.strings	2008-01-14 13:20:15 UTC (rev 1559)
@@ -200,13 +200,13 @@
 </table>
 
 [StatisticsHistory.html]
-<h2>Received</h2>
+<h2>Messages Received</h2>
 <div class="iblock chart">{received}</div>
 
-<h2>Routed</h2>
+<h2>Messages Routed</h2>
 <div class="iblock chart">{routed}</div>
 
-<h2>Dropped</h2>
+<h2>Messages Dropped</h2>
 <div class="iblock chart">{dropped}</div>
 
 [ExchangeProducerSet.html]

Modified: mgmt/cumin/python/cumin/stat.py
===================================================================
--- mgmt/cumin/python/cumin/stat.py	2008-01-14 04:45:16 UTC (rev 1558)
+++ mgmt/cumin/python/cumin/stat.py	2008-01-14 13:20:15 UTC (rev 1559)
@@ -103,6 +103,9 @@
 
         return "stats.png?" + ";".join(params)
 
+    def render_mode(self, session, object):
+        return self.mode
+
     def render_stats(self, session, object):
         writer = Writer()
 
@@ -126,10 +129,9 @@
 
         return html
 
-    def render_stat_unit(self, session, args):
+    def render_stat_name(self, session, args):
         stat, object = args
-        value = stat.value(object)
-        return "%s%s" % (stat.unit, ess(value))
+        return stat.name
 
 class StatChartPage(Page):
     def __init__(self, app, name):

Modified: mgmt/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/cumin/python/cumin/stat.strings	2008-01-14 04:45:16 UTC (rev 1558)
+++ mgmt/cumin/python/cumin/stat.strings	2008-01-14 13:20:15 UTC (rev 1559)
@@ -64,12 +64,9 @@
 
 [StatValueChart.javascript]
 function updateChart(id, object) {
-    
-}
+    var chart = wooly.doc().elembyid(id);
 
-function updateChartImage(id, object) {
-    var img = wooly.doc().elembyid(id);
-    
+    var img = chart.elem("img")
     var src = img.getattr("src");
     var sep = src.lastIndexOf(";");
     var time = new Date().getTime();
@@ -81,6 +78,15 @@
     }
 
     img.setattr("src", src);
+
+    var ph = chart.elem("span", "class", "ph")
+    var statname = ph.getattr("statname")
+    var statmode = ph.getattr("statmode")
+    if (statmode == "rate") {
+        ph.text().set(object.stat[statname].rate)
+    } else {
+        ph.text().set(object.stat[statname].value)
+    }
 }
 
 [StatValueChart.css]
@@ -97,7 +103,7 @@
 }
 
 [StatValueChart.html]
-<table class="StatValueChart">
+<table class="StatValueChart" id="{id}">
   <tr>
     <td><img id="{id}" src="{href}" height="140" width="540"/></td>
     <td>
@@ -108,11 +114,11 @@
   </tr>
 </table>
 <script>
-  cumin.listeners["{id}"] = updateChartImage
+  cumin.listeners["{id}"] = updateChart
 </script>
 
 [StatValueChart.stat_html]
 <li>
   <span class="swatch" style="background-color: {stat_color}">&nbsp;</span>
-  &nbsp; {stat_value} {stat_unit}
+  &nbsp; <span class="ph" statname="{stat_name}" statmode="{mode}">{stat_value}</span>
 </li>