From fd7d5b3d38f43eb87bf43a850822799d6ebe1091 Mon Sep 17 00:00:00 2001 From: Kenneth Anthony Giusti Date: Mon, 30 Aug 2010 22:12:57 +0000 Subject: QMF: do not add wildcards to the agent filter list. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@991006 13f79535-47bb-0310-9956-ffa450edef68 --- extras/qmf/src/py/qmf/console.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/extras/qmf/src/py/qmf/console.py b/extras/qmf/src/py/qmf/console.py index 3d514d7073..79e74d6198 100644 --- a/extras/qmf/src/py/qmf/console.py +++ b/extras/qmf/src/py/qmf/console.py @@ -762,12 +762,22 @@ class Session: """ if not self.userBindings: raise Exception("Session not configured for binding specific agents.") - self.agent_filter.append((vendor, product, instance)) if product is not None: v2key = "agent.ind.heartbeat.%s.%s.#" % (vendor.replace(".", "_"), product.replace(".", "_")) else: v2key = "agent.ind.heartbeat.%s.#" % vendor.replace(".", "_") self.v2BindingKeyList.append(v2key) + + # allow wildcards - only add filter if a non-wildcarded component is given + if vendor == "*": + vendor = None + if product == "*": + product = None + if instance == "*": + instance = None + if vendor or product or instance: + self.agent_filter.append((vendor, product, instance)) + for broker in self.brokers: if broker.isConnected(): if broker.brokerSupportsV2: -- cgit v1.2.1