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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-12 10:33:22 -0500 (Wed, 12 Dec 2007)
New Revision: 1462

Modified:
   mgmt/cumin/python/cumin/exchange.py
   mgmt/cumin/python/cumin/model.py
   mgmt/cumin/python/cumin/queue.py
Log:
Adds ui metadata for binding stats and uses it to properly statify
some column values.



Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py	2007-12-12 15:18:04 UTC (rev 1461)
+++ mgmt/cumin/python/cumin/exchange.py	2007-12-12 15:33:22 UTC (rev 1462)
@@ -223,11 +223,12 @@
         return binding.bindingKey
 
     def render_item_messages_matched(self, session, binding):
-        return binding.statsCurr.msgMatched #XXX statify
+        stat = self.app.model.binding.get_stat("msgMatched")
+        return stat.value(binding)
 
     def render_item_messages_matched_rate(self, session, binding):
-        value = binding.statsCurr.msgMatched #XXX statify
-        return fmt_rate(value, "msg", "sec")
+        stat = self.app.model.binding.get_stat("msgMatched")
+        return fmt_rate(stat.rate(binding), "msg", "sec")
 
 class ExchangeForm(CuminForm):
     def __init__(self, app, name):

Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py	2007-12-12 15:18:04 UTC (rev 1461)
+++ mgmt/cumin/python/cumin/model.py	2007-12-12 15:33:22 UTC (rev 1462)
@@ -15,6 +15,9 @@
         self.exchange = CuminExchange(self)
         self.add_class(self.exchange)
 
+        self.binding = CuminBinding(self)
+        self.add_class(self.binding)
+        
     def add_class(self, cls):
         self.classes[cls.mint_class] = cls
 
@@ -330,3 +333,14 @@
         self.write_stat_xml(exchange, writer)
             
         writer.write("</exchange>")
+
+class CuminBinding(CuminClass):
+    def __init__(self, model):
+        super(CuminBinding, self).__init__(model, "binding", Binding)
+
+        self.mint_stats_class = BindingStats
+
+        stat = CuminStat(self, "msgMatched", "int")
+        stat.title = "Msgs. Matched"
+        stat.unit = "message"
+        stat.categories = ("general")

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2007-12-12 15:18:04 UTC (rev 1461)
+++ mgmt/cumin/python/cumin/queue.py	2007-12-12 15:33:22 UTC (rev 1462)
@@ -232,13 +232,12 @@
         return binding.bindingKey
 
     def render_item_messages_matched(self, session, binding):
-        #stat = self.app.model.binding.get_stat("msgMatched")
-        return binding.statsCurr.msgMatched #XXX
+        stat = self.app.model.binding.get_stat("msgMatched")
+        return stat.value(binding)
 
     def render_item_messages_matched_rate(self, session, binding):
-        #stat = self.app.model.binding.get_stat("msgMatched")
-        value = binding.statsCurr.msgMatched #XXX
-        return fmt_rate(value, "msg", "sec")
+        stat = self.app.model.binding.get_stat("msgMatched")
+        return fmt_rate(stat.rate(binding), "msg", "sec")
 
 class QueueForm(CuminForm):
     def __init__(self, app, name):