1:05 p.m.
Author: tmckay
Date: 2011-06-24 18:05:27 +0000 (Fri, 24 Jun 2011)
New Revision: 4855
Modified:
branches/sage_addition/cumin/python/cumin/messaging/brokerlink.py
branches/sage_addition/cumin/python/cumin/messaging/connection.py
branches/sage_addition/cumin/python/cumin/messaging/queue.py
Log:
Tie messaging operations specifically to the qmf operations object in
RemoteOperations, even though it would find the right method anyway
(unlikely that Aviary will provide messaging operations). This is more
clear, removes a possibility of name collision, and its more efficient.
Modified: branches/sage_addition/cumin/python/cumin/messaging/brokerlink.py
===================================================================
--- branches/sage_addition/cumin/python/cumin/messaging/brokerlink.py 2011-06-24 17:40:40
UTC (rev 4854)
+++ branches/sage_addition/cumin/python/cumin/messaging/brokerlink.py 2011-06-24 18:05:27
UTC (rev 4855)
@@ -52,7 +52,7 @@
self.app.main_page.main.messaging.broker.view.show(session)
def do_invoke(self, invoc, link):
- self.app.remote.close(link, invoc.make_callback())
+ self.app.remote.qmf.close(link, invoc.make_callback())
class BrokerLinkSelector(ObjectSelector):
def __init__(self, app, name, vhost):
@@ -83,7 +83,7 @@
return "Remove broker link"
def do_invoke(self, invoc, link):
- self.app.remote.close(link, invoc.make_callback())
+ self.app.remote.qmf.close(link, invoc.make_callback())
class RouteSelector(ObjectSelector):
def __init__(self, app, name, link):
@@ -110,7 +110,7 @@
return "Remove"
def do_invoke(self, invoc, route):
- self.app.remote.close(route, invoc.make_callback())
+ self.app.remote.qmf.close(route, invoc.make_callback())
# XXX RouteFrame
@@ -122,7 +122,7 @@
self.app.main_page.main.messaging.broker.view.show(session)
def do_invoke(self, invoc, route):
- self.app.remote.close(route, invoc.make_callback())
+ self.app.remote.qmf.close(route, invoc.make_callback())
class LinkGeneralStatSet(StatSet):
def __init__(self, app, name, object):
@@ -225,7 +225,7 @@
def do_invoke(self, invoc, link, exchange, key, tag, dynamic, sync,
excludes):
- self.app.remote.bridge(link, link.durable, exchange.name, exchange.name,
+ self.app.remote.qmf.bridge(link, link.durable, exchange.name, exchange.name,
key, tag, excludes, False, False, dynamic, sync,
invoc.make_callback())
@@ -353,7 +353,7 @@
else:
mech = "PLAIN"
- self.app.remote.connect(obj, host, port, durable, mech, username,
+ self.app.remote.qmf.connect(obj, host, port, durable, mech, username,
password, transport, invoc.make_callback())
class BrokerLinkAddForm(ObjectFrameTaskForm):
Modified: branches/sage_addition/cumin/python/cumin/messaging/connection.py
===================================================================
--- branches/sage_addition/cumin/python/cumin/messaging/connection.py 2011-06-24 17:40:40
UTC (rev 4854)
+++ branches/sage_addition/cumin/python/cumin/messaging/connection.py 2011-06-24 18:05:27
UTC (rev 4855)
@@ -50,7 +50,7 @@
raise Exception \
("Cannot close management connection %s" % conn.address)
- self.app.remote.close(conn, invoc.make_callback())
+ self.app.remote.qmf.close(conn, invoc.make_callback())
class ConnectionSelector(ObjectSelector):
def __init__(self, app, name, vhost):
@@ -96,7 +96,7 @@
raise Exception \
("Cannot close management connection %s" % conn.address)
- self.app.remote.close(conn, invoc.make_callback())
+ self.app.remote.qmf.close(conn, invoc.make_callback())
def get_item_content(self, session, item):
args = (item.remoteProcessName, item.remotePid)
@@ -168,14 +168,14 @@
return "Close"
def do_invoke(self, invoc, sess):
- self.app.remote.close(sess, invoc.make_callback())
+ self.app.remote.qmf.close(sess, invoc.make_callback())
class SessionDetach(ObjectFrameTask):
def get_title(self, session):
return "Detach"
def do_invoke(self, invoc, sess):
- self.app.remote.detach(sess, invoc.make_callback())
+ self.app.remote.qmf.detach(sess, invoc.make_callback())
class SessionSelector(ObjectSelector):
def __init__(self, app, name, conn):
@@ -205,11 +205,11 @@
return "Close"
def do_invoke(self, invoc, sess):
- self.app.remote.close(sess, invoc.make_callback())
+ self.app.remote.qmf.close(sess, invoc.make_callback())
class SessionSelectionDetach(ObjectSelectorTask):
def get_title(self, session):
return "Detach"
def do_invoke(self, invoc, sess):
- self.app.remote.detach(sess, invoc.make_callback())
+ self.app.remote.qmf.detach(sess, invoc.make_callback())
Modified: branches/sage_addition/cumin/python/cumin/messaging/queue.py
===================================================================
--- branches/sage_addition/cumin/python/cumin/messaging/queue.py 2011-06-24 17:40:40 UTC
(rev 4854)
+++ branches/sage_addition/cumin/python/cumin/messaging/queue.py 2011-06-24 18:05:27 UTC
(rev 4855)
@@ -102,7 +102,7 @@
return "Purge"
def do_invoke(self, invoc, queue, count=0):
- self.app.remote.purge_queue(queue, count, invoc.make_callback())
+ self.app.remote.qmf.purge_queue(queue, count, invoc.make_callback())
class QueueBindingSelector(BindingSelector):
def __init__(self, app, name, queue):
@@ -361,7 +361,7 @@
return "Purge"
def do_invoke(self, invoc, queue, count=0):
- self.app.remote.purge_queue(queue, count, invoc.make_callback())
+ self.app.remote.qmf.purge_queue(queue, count, invoc.make_callback())
class QueuePurgeForm(ObjectFrameTaskForm):
def __init__(self, app, name, task):
@@ -607,7 +607,7 @@
cls = self.app.model.org_apache_qpid_broker.Broker
broker = cls.get_object_by_id(cursor, vhost._brokerRef_id)
- self.app.remote.queue_move_messages(broker, src, dst, count,
invoc.make_callback())
+ self.app.remote.qmf.queue_move_messages(broker, src, dst, count,
invoc.make_callback())
class MoveQueueMessages(MoveMessagesBase):
def __init__(self, app, frame):