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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-14 11:06:50 -0500 (Fri, 14 Dec 2007)
New Revision: 1493

Modified:
   mgmt/cumin/python/cumin/client.py
   mgmt/cumin/python/cumin/client.strings
   mgmt/cumin/python/cumin/model.py
   mgmt/notes/justin-todo.txt
Log:
Fixes client ajax.

Makes xml generation from ui metadata simpler.

Makes names in client statistics history consistent.

Fixes a crashing chart.



Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py	2007-12-14 15:49:19 UTC (rev 1492)
+++ mgmt/cumin/python/cumin/client.py	2007-12-14 16:06:50 UTC (rev 1493)
@@ -189,11 +189,11 @@
         def get_title(self, session, client):
             return "History"
 
-        def render_produced_chart_url(self, session, client):
+        def render_sent_chart_url(self, session, client):
             return "client.png?id=%i;s=framesFromClient;s=bytesFromClient" \
                    % client.id
 
-        def render_consumed_chart_url(self, session, client):
+        def render_received_chart_url(self, session, client):
             return "client.png?id=%i;s=framesToClient;s=bytesToClient" \
                    % client.id
 

Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings	2007-12-14 15:49:19 UTC (rev 1492)
+++ mgmt/cumin/python/cumin/client.strings	2007-12-14 16:06:50 UTC (rev 1493)
@@ -138,19 +138,19 @@
 </script>
 
 [StatisticsHistory.html]
-<h2>Produced</h2>
+<h2>Sent</h2>
 <div class="iblock chart">
-  <img id="{id}.produced" src="{produced_chart_url}"/>
+  <img id="{id}.sent" src="{sent_chart_url}"/>
 </div>
 
-<h2>Consumed</h2>
+<h2>Received</h2>
 <div class="iblock chart">
-  <img id="{id}.consumed" src="{consumed_chart_url}"/>
+  <img id="{id}.received" src="{received_chart_url}"/>
 </div>
 
 <script>
-  cumin.client.listeners["{id}.produced"] = updateImage
-  cumin.client.listeners["{id}.consumed"] = updateImage
+  cumin.client.listeners["{id}.sent"] = updateImage
+  cumin.client.listeners["{id}.received"] = updateImage
 </script>
 
 [ClientSessionSet.html]

Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py	2007-12-14 15:49:19 UTC (rev 1492)
+++ mgmt/cumin/python/cumin/model.py	2007-12-14 16:06:50 UTC (rev 1493)
@@ -40,6 +40,9 @@
             if stat.name == name:
                 return stat
 
+    def get_object_name(self, object):
+        return object.name
+
     def write_event_xml(self, object, writer):
         writer.write("<events errors=\"%i\" warnings=\"%i\"/>" % (0, 0))
 
@@ -51,6 +54,16 @@
         for stat in self.stats:
             stat.write_xml(object, writer)
 
+    def write_xml(self, object, writer):
+        writer.write("<%s id=\"%i\" name=\"%s\">" % \
+                         (self.name, object.id, self.get_object_name(object)))
+
+        self.write_event_xml(object, writer)
+        self.write_action_xml(object, writer)
+        self.write_stat_xml(object, writer)
+            
+        writer.write("</%s>" % self.name)
+
 class CuminStat(object):
     def __init__(self, cls, name, type):
         self.model = cls.model
@@ -84,7 +97,7 @@
 
         for stat in stats:
             time = getattr(stat, "recTime")
-            value = getattr(stat, self.name)
+            value = getattr(stat, self.name, 0)
             samples.append((time, value))
 
         return samples
@@ -111,7 +124,7 @@
     def write_xml(self, object, writer):
         writer.write("<stat name=\"%s\" value=\"%i\" rate=\"%i\"/>" \
                      % (self.name,
-                        self.value(object) or 0,
+                        self.value(object) or 0, #XXX need a null value
                         self.rate(object) or 0))
 
 class CuminQueue(CuminClass):
@@ -270,15 +283,6 @@
         stat.unit = "byte"
         stat.categories = ("byte", "persistent")
 
-    def write_xml(self, queue, writer):
-        writer.write("<queue id=\"%i\" name=\"%s\">" % (queue.id, queue.name))
-
-        self.write_event_xml(queue, writer)
-        self.write_action_xml(queue, writer)
-        self.write_stat_xml(queue, writer)
-            
-        writer.write("</queue>")
-
 class CuminExchange(CuminClass):
     def __init__(self, model):
         super(CuminExchange, self).__init__(model, "exchange", Exchange)
@@ -327,16 +331,6 @@
         stat.unit = "message"
         stat.categories = ("general")
 
-    def write_xml(self, exchange, writer):
-        writer.write("<exchange id=\"%i\" name=\"%s\">" % \
-                         (exchange.id, exchange.name))
-
-        self.write_event_xml(exchange, writer)
-        self.write_action_xml(exchange, writer)
-        self.write_stat_xml(exchange, writer)
-            
-        writer.write("</exchange>")
-
 class CuminBinding(CuminClass):
     def __init__(self, model):
         super(CuminBinding, self).__init__(model, "binding", Binding)
@@ -348,6 +342,9 @@
         stat.unit = "message"
         stat.categories = ("general")
 
+    def get_object_name(self, binding):
+        return ""
+
 class CuminClient(CuminClass):
     def __init__(self, model):
         super(CuminClient, self).__init__(model, "client", Client)
@@ -374,6 +371,9 @@
         stat.unit = "frame"
         stat.categories = ("general")
 
+    def get_object_name(self, client):
+        return client.address
+
 class CuminSession(CuminClass):
     def __init__(self, model):
         super(CuminSession, self).__init__(model, "session", Session)

Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt	2007-12-14 15:49:19 UTC (rev 1492)
+++ mgmt/notes/justin-todo.txt	2007-12-14 16:06:50 UTC (rev 1493)
@@ -42,8 +42,6 @@
    - Need to handle exceptions in broker connect thread, so it doesn't
      stop trying
 
- * Fix client ajax
-
 Deferred
 
  * Add an edit form for broker registrations so you can change their