From 7ad3988e599da508eb782ca84d97033b33692ac4 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Thu, 20 Nov 2008 14:51:45 +0000 Subject: QPID-1476 - routing keys used for updates can't be used to discriminate by agent - Fixed routing keys in agents and binding keys in consoles - Added some additional debug output for ManagementAgentImpl - Minor cleanup in the connection close path for ManagementAgentImpl git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@719245 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/qpid/qmfconsole.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/python') diff --git a/qpid/python/qpid/qmfconsole.py b/qpid/python/qpid/qmfconsole.py index aa4b149601..bdd93e6f94 100644 --- a/qpid/python/qpid/qmfconsole.py +++ b/qpid/python/qpid/qmfconsole.py @@ -224,7 +224,7 @@ class Session: raise Exception("userBindings option not set for Session") for broker in self.brokers: broker.amqpSession.exchange_bind(exchange="qpid.management", queue=broker.topicName, - binding_key="console.obj.%s.#" % packageName) + binding_key="console.obj.*.*.%s.#" % packageName) def bindClass(self, classKey): """ """ @@ -233,7 +233,7 @@ class Session: pname, cname, hash = classKey for broker in self.brokers: broker.amqpSession.exchange_bind(exchange="qpid.management", queue=broker.topicName, - binding_key="console.obj.%s.%s.#" % (pname, cname)) + binding_key="console.obj.*.*.%s.%s.#" % (pname, cname)) def getAgents(self, broker=None): """ Get a list of currently known agents """ @@ -370,7 +370,7 @@ class Session: if self.rcvObjects and not self.userBindings: keyList.append("console.obj.#") else: - keyList.append("console.obj.org.apache.qpid.broker.agent") + keyList.append("console.obj.*.*.org.apache.qpid.broker.agent") if self.rcvEvents: keyList.append("console.event.#") if self.rcvHeartbeats: -- cgit v1.2.1