[rhmessaging-commits] rhmessaging commits: r1210 - in mgmt: notes and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-11-02 09:45:22 -0400 (Fri, 02 Nov 2007)
New Revision: 1210

Modified:
   mgmt/cumin/python/cumin/model.py
   mgmt/cumin/python/cumin/page.strings
   mgmt/cumin/python/cumin/queue.py
   mgmt/notes/justin-todo.txt
Log:
Reverts to dummy data until the new model lands.

Restyles select boxes a little.



Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py	2007-11-02 13:30:43 UTC (rev 1209)
+++ mgmt/cumin/python/cumin/model.py	2007-11-02 13:45:22 UTC (rev 1210)
@@ -1,6 +1,5 @@
 from wooly import *
 from wooly.model import *
-from schema import *
 
 class CuminModel(Model):
     def __init__(self):
@@ -349,22 +348,13 @@
                     self.__low = value
 
     def get_value(self):
-        if self.class_:
-            try:
-                stats = self.class_.select().orderBy("recTime").reversed()[0]
-                return getattr(stats, self.name, None)
-            except IndexError:
-                pass
-        else:
-            return self.__value
+        return self.__value
 
     # get recent values, with latest value at index 0
     def get_values(self, limit=100):
-        if self.class_:
-            stats = self.class_.select().orderBy("recTime").reversed()
-            return [getattr(x, self.name) for x in stats[:limit]]
-        else:
-            return self.__values[-limit:]
+        values = self.__values[-limit:]
+        values.reverse()
+        return values
 
     def get_rate(self, interval=3):
         values = self.get_values(2)
@@ -400,6 +390,8 @@
 
         # General
 
+        MgmtQueueStats = None
+
         measure = Measurement("msgDepth", "int", MgmtQueueStats)
         measure.title = "Message Depth"
         measure.unit = "message"

Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings	2007-11-02 13:30:43 UTC (rev 1209)
+++ mgmt/cumin/python/cumin/page.strings	2007-11-02 13:45:22 UTC (rev 1210)
@@ -362,6 +362,10 @@
   float: left;
 }
 
+select {
+  border-style: groove;
+}
+
 ul.radiotabs {
   list-style: none;
   margin: 0 0 1em 0;

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2007-11-02 13:30:43 UTC (rev 1209)
+++ mgmt/cumin/python/cumin/queue.py	2007-11-02 13:45:22 UTC (rev 1210)
@@ -9,8 +9,6 @@
 from parameters import *
 from util import *
 
-from schema import *
-
 strings = StringCatalog(__file__)
 
 class QueueXmlPage(Page):

Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt	2007-11-02 13:30:43 UTC (rev 1209)
+++ mgmt/notes/justin-todo.txt	2007-11-02 13:45:22 UTC (rev 1210)
@@ -4,26 +4,22 @@
 
    - Find/connect in bulk
 
- * Queue
-
-   - Add a msg enq rate msg deq rate chart
-
-   - Add created, deleted, updated timestamps
-
  * queue: link bindings, consumers stat to respective views
 
  * exch: link bindings, producers stats to respective views
 
- * model: get rid of the old *_count stat fields and use the new ones
-
  * Make status boxes display stats like those from list views
 
- * Restyle drop boxes to not be beveled
+   - model: get rid of the old *_count stat fields and use the new ones
 
  * Right align status boxes?
 
 Deferred
 
+ * Queue: Add created, deleted, updated timestamps
+
+ * Queue: Add a msg enq rate msg deq rate chart
+
  * Make the status lights also be links to an appropriate view
 
    - Defer until we know what we're going to link to