[rhmessaging-commits] rhmessaging commits: r3337 - mgmt/trunk/cumin/python/cumin/grid.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-04-27 17:18:28 -0400 (Mon, 27 Apr 2009)
New Revision: 3337

Modified:
   mgmt/trunk/cumin/python/cumin/grid/pool.py
Log:
Use collector stats on pool overview page instead of fake pool stats

Modified: mgmt/trunk/cumin/python/cumin/grid/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/pool.py	2009-04-27 21:05:58 UTC (rev 3336)
+++ mgmt/trunk/cumin/python/cumin/grid/pool.py	2009-04-27 21:18:28 UTC (rev 3337)
@@ -288,7 +288,7 @@
     def __init__(self, app, name):
         super(PoolStats, self).__init__(app, name)
 
-        stats = PoolStatSet(app, "slot_stats", "general")
+        stats = self.CollectorStatSet(app, "slot_stats", "general")
         self.add_child(stats)
 
         stats = self.GridStats(app, "grid_stats")
@@ -318,6 +318,10 @@
         pool = self.frame.get_args(session)[0]
         return Collector.select("pool='%s'" % pool.id)
 
+    class CollectorStatSet(StatSet):
+        def get_args(self, session):
+            return self.parent.get_collector_args(session)
+
     class JobStackedChart(StatStackedChart):
         def render_title(self, session, *args):
             return "Job Status"
@@ -385,22 +389,6 @@
         def render_slot_clip_size(self, session, *args):
             return 400
 
-class PoolStatSet(StatSet):
-    def render_rate_text(self, session, *args):
-        return "Percentage"
-
-    def do_get_items(self, session, pool):
-        stats = super(PoolStatSet, self).do_get_items(session, pool)
-
-        action = self.app.model.pool.fakestats
-        record = action.get_stat_record(session, pool)
-
-        fake_stats = list()
-        for stat in stats:
-            fake_stats.append((stat[0], record))
-
-        return fake_stats
-
 class PoolJobStats(CuminTable):
     def render_sql_where(self, session, pool):
         elems = list()