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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-17 16:51:49 -0500 (Mon, 17 Dec 2007)
New Revision: 1506

Modified:
   mgmt/cumin/python/cumin/__init__.py
   mgmt/cumin/python/cumin/queue.py
   mgmt/cumin/python/cumin/widgets.py
Log:
An approximate fix for column sort of stat columns in the queue list.



Modified: mgmt/cumin/python/cumin/__init__.py
===================================================================
--- mgmt/cumin/python/cumin/__init__.py	2007-12-17 19:26:18 UTC (rev 1505)
+++ mgmt/cumin/python/cumin/__init__.py	2007-12-17 21:51:49 UTC (rev 1506)
@@ -32,7 +32,7 @@
         self.model = CuminModel()
 
         self.broker_connect_thread = BrokerConnectThread(self.model)
-        #self.broker_connect_thread.start()
+        self.broker_connect_thread.start()
 
         self.cumin_page = CuminPage(self, "cumin.html")
         self.set_default_page(self.cumin_page)
@@ -106,5 +106,3 @@
             print "Connection succeeded"
         except socket.error:
             print "Connection failed"
-
-        

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2007-12-17 19:26:18 UTC (rev 1505)
+++ mgmt/cumin/python/cumin/queue.py	2007-12-17 21:51:49 UTC (rev 1506)
@@ -28,13 +28,15 @@
         col = TableColumn(None)
         self.header.add_column(col)
 
-        col = TableColumn("name", "name", "Name")
+        col = TableColumn("name", Queue.q.name, "Name")
         self.header.add_column(col)
 
-        col = TableColumn("bindings", None, "Exchange Bindings", "ralign")
+        col = TableColumn("bindings", QueueStats.q.bindings,
+                          "Exchange Bindings", "ralign")
         self.header.add_column(col)
         
-        col = TableColumn("consumers", None, "Consumers", "ralign")
+        col = TableColumn("consumers", QueueStats.q.consumers,
+                          "Consumers", "ralign")
         self.header.add_column(col)
 
         col = self.EnqueuedColumn("enqueued", None, None, "ralign")
@@ -66,36 +68,39 @@
             return "%s Enqueued" % self.header.parent().get_unit_plural \
                 (session)
 
-        def get_column(self, session, items):
-            unit = self.header.parent().unit.get(session)
-            return "queue_stats.%sTotalEnqueues" % \
-                (unit == "b" and "byte" or "msg")
+        def get_column_name(self, session):
+            if self.header.parent().unit.get(session) == "b":
+                return QueueStats.q.byteTotalEnqueues
+            else:
+                return QueueStats.q.msgTotalEnqueues
 
     class DequeuedColumn(TableColumn):
         def get_title(self, session):
             return "%s Dequeued" % self.header.parent().get_unit_plural \
                 (session)
 
-        def get_column(self, session, items):
-            unit = self.header.parent().unit.get(session)
-            return "queue_stats.%sTotalDequeues" % \
-                (unit == "b" and "byte" or "msg")
+        def get_column_name(self, session):
+            if self.header.parent().unit.get(session) == "b":
+                return QueueStats.q.byteTotalDequeues
+            else:
+                return QueueStats.q.msgTotalDequeues
 
     class DepthColumn(TableColumn):
         def get_title(self, session):
             return "%s Depth" % self.header.parent().get_unit_singular(session)
 
-        def get_column(self, session, items):
-            unit = self.header.parent().unit.get(session)
-            return "queue_stats.%sDepth" % (unit == "b" and "byte" or "msg")
+        def get_column_name(self, session):
+            if self.header.parent().unit.get(session) == "b":
+                return QueueStats.q.byteDepth
+            else:
+                return QueueStats.q.msgDepth
 
     def get_item_count(self, session, vhost):
         return vhost.queues.count()
 
     def do_get_items(self, session, vhost):
         if vhost:
-            queues = Queue.select()
-            queues = queues.filter(Queue.q.vhostID == vhost.id)
+            queues = vhost.queues
             queues = queues.filter(Queue.q.statsCurrID == QueueStats.q.id)
 
             column = self.header.get_selected_column(session)
@@ -283,9 +288,13 @@
         return queue.bindings.count()
 
     def do_get_items(self, session, queue):
+        bindings = queue.bindings
+
         start, end = self.get_bounds(session)
-        return queue.bindings[start:end]
+        bindings = bindings[start:end]
 
+        return bindings
+
     def render_item_href(self, session, binding):
         branch = session.branch()
         self.page().show_exchange(branch, binding.exchange)

Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py	2007-12-17 19:26:18 UTC (rev 1505)
+++ mgmt/cumin/python/cumin/widgets.py	2007-12-17 21:51:49 UTC (rev 1506)
@@ -377,9 +377,14 @@
         return self.class_
 
     def get_sorted_items(self, session, items):
-        # XXX sqlobject specific
-        return items.orderBy(self.get_column_name(session))
+        name = self.get_column_name(session)
 
+        if name:
+            # XXX sqlobject specific
+            items = items.orderBy(self.get_column_name(session))
+
+        return items
+
 class PaginatedItemSet(ItemSet):
     def __init__(self, app, name):
         super(PaginatedItemSet, self).__init__(app, name)