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

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-01-07 09:22:24 -0500 (Wed, 07 Jan 2009)
New Revision: 3033

Modified:
   mgmt/trunk/cumin/python/cumin/model.py
   mgmt/trunk/cumin/python/cumin/pool.py
   mgmt/trunk/cumin/python/cumin/slot.strings
Log:
Changed pool status box to show "x of x slots idle" instead of "x of x slots active".

Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py	2009-01-06 14:58:24 UTC (rev 3032)
+++ mgmt/trunk/cumin/python/cumin/model.py	2009-01-07 14:22:24 UTC (rev 3033)
@@ -1933,7 +1933,7 @@
         stat = self.PercentStat(self, "total")
         stat.title = "Total Jobs"
 
-        stat = self.StatusStat(self, "active")
+        stat = self.StatusStat(self, "idl")
         stat.category = "status"
 
         stat = self.StatusStat(self, "all")

Modified: mgmt/trunk/cumin/python/cumin/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/pool.py	2009-01-06 14:58:24 UTC (rev 3032)
+++ mgmt/trunk/cumin/python/cumin/pool.py	2009-01-07 14:22:24 UTC (rev 3033)
@@ -518,5 +518,5 @@
         action = self.app.model.pool.poolstatus
         record = action.get_stat_record(session, pool)
 
-        return record and "<div><span>%i</span> of <span>%i</span> slots active</div>" % \
-            (record["active"], record["all"]) or ""
+        return record and "<div><span>%i</span> of <span>%i</span> slots idle</div>" % \
+            (record["idl"], record["all"]) or ""

Modified: mgmt/trunk/cumin/python/cumin/slot.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/slot.strings	2009-01-06 14:58:24 UTC (rev 3032)
+++ mgmt/trunk/cumin/python/cumin/slot.strings	2009-01-07 14:22:24 UTC (rev 3033)
@@ -20,7 +20,7 @@
 
 [SlotStatSet.sql]
 select 
-  sum(case activity when 'Idle' then 0 else 1 end) as active,
+  sum(case activity when 'Idle' then 1 else 0 end) as idl,
   sum(1) as all
 from (select 
   s.name,