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

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-02-17 11:29:27 -0500 (Tue, 17 Feb 2009)
New Revision: 3121

Modified:
   mgmt/trunk/cumin/python/cumin/brokerlink.py
   mgmt/trunk/cumin/python/cumin/model.py
Log:
Added new sync argument to link.bridge method and defaulted it to 0

Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py	2009-02-16 19:03:14 UTC (rev 3120)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py	2009-02-17 16:29:27 UTC (rev 3121)
@@ -274,7 +274,8 @@
 class PeerStatus(CuminStatus):
     
     def render_color(self, session, link):
-        return link.statsCurr.lastError and "red" or "green"
+        if link.statsCurr:
+            return link.statsCurr.lastError and "red" or "green"
     
     def render_peer_state(self, session, peer):
         return peer.statsCurr.state
@@ -417,7 +418,10 @@
 
         self.dynamic = self.DynamicField(app, "dynamic")
         self.more.add_field(self.dynamic)
-                
+
+        self.sync = self.SyncField(app, "sync")
+        self.more.add_field(self.sync)
+        
     def get_args(self, session):
         return self.frame.get_args(session)
     
@@ -431,6 +435,19 @@
         if not self.excludes.get(session):
             self.excludes.set(session, "%s:%s" % (args[0].host, args[0].port))
             
+        if not self.sync.get(session):
+            self.sync.set(session, self.sync.get_default(session))
+            
+    class SyncField(IntegerField):
+        def render_title(self, session):
+            return "Ack"
+        
+        def render_field_help(self, session):
+             return "Acknowledge transfers over the bridge in batches of N"
+
+        def get_default(self, session):
+            return 0
+        
     class DynamicField(TwoOptionRadioField):
         def render_title(self, session):
             return "Dynamic Route?"
@@ -466,13 +483,15 @@
             exchange = Exchange.get(int(exchange_id))
             durable = link.durable
             dynamic = self.dynamic.get(session) == "yes"
-
+            sync = self.sync.get(session)
+            
             args = {"durable": durable,
                     "exchange": exchange.name,
                     "key": key,
                     "tag": tag,
                     "excludes": excludes,
-                    "dynamic": dynamic
+                    "dynamic": dynamic,
+                    "sync": sync
                     }
             
             action = self.app.model.link.bridge

Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py	2009-02-16 19:03:14 UTC (rev 3120)
+++ mgmt/trunk/cumin/python/cumin/model.py	2009-02-17 16:29:27 UTC (rev 3121)
@@ -1632,11 +1632,12 @@
             tag = args["tag"]
             dynamic = args["dynamic"]
             excludes = args["excludes"]
+            sync = args["sync"]
             
             link.bridge(self.model.data, completion, 
                         durable, src, dest, key, 
-                        tag, excludes, False, False, dynamic)
-    
+                        tag, excludes, False, False, dynamic, sync)
+
     class Close(CuminAction):
         def show(self, session, link):
             frame = self.cumin_class.show_object(session, link)