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

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-08-25 15:11:27 -0400 (Mon, 25 Aug 2008)
New Revision: 2354

Modified:
   mgmt/trunk/cumin/python/cumin/brokerlink.py
   mgmt/trunk/cumin/python/cumin/brokerlink.strings
Log:
On the view broker link page, make the status box red when there is a non-null last error

Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py	2008-08-25 18:29:45 UTC (rev 2353)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py	2008-08-25 19:11:27 UTC (rev 2354)
@@ -268,24 +268,16 @@
         return "No, Cancel"
 
 class PeerStatus(CuminStatus):
-    def render_messages_received(self, session, peer):
-        return self.app.model.exchange.msgReceives.rate_html(peer)
+    
+    def render_color(self, session, link):
+        return link.statsCurr.lastError and "red" or "green"
+    
+    def render_peer_state(self, session, peer):
+        return peer.statsCurr.state
 
-    def render_messages_routed(self, session, peer):
-        return self.app.model.exchange.msgRoutes.rate_html(peer)
+    def render_peer_error(self, session, peer):
+        return peer.statsCurr.lastError
 
-    def render_messages_dropped(self, session, peer):
-        return self.app.model.exchange.msgDrops.value(peer)
-
-    def render_bytes_received(self, session, peer):
-        return self.app.model.exchange.byteReceives.rate_html(peer)
-
-    def render_bytes_routed(self, session, peer):
-        return self.app.model.exchange.byteRoutes.rate_html(peer)
-
-    def render_bytes_dropped(self, session, peer):
-        return self.app.model.exchange.byteDrops.value(peer)
-
 class PeerView(CuminView):
     def __init__(self, app, name):
         super(PeerView, self).__init__(app, name)

Modified: mgmt/trunk/cumin/python/cumin/brokerlink.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.strings	2008-08-25 18:29:45 UTC (rev 2353)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.strings	2008-08-25 19:11:27 UTC (rev 2354)
@@ -312,3 +312,18 @@
   }
 ]]>
 </script>
+
+
+[PeerStatus.html]
+<div id="{id}" class="CuminStatus {color}">
+  <table>
+    <tr>
+      <th><strong>State</strong></th>
+      <td>{peer_state}</td>
+    </tr>
+    <tr>
+      <th><strong>Last Error</strong></th>
+      <td>{peer_error}</td>
+    </tr>
+  </table>
+</div>