diff options
| author | Alan Conway <aconway@apache.org> | 2010-02-05 23:02:45 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-02-05 23:02:45 +0000 |
| commit | 5dd3cd3ae035673bf6003b6422712663ffa57fe5 (patch) | |
| tree | 0fd603d1e693b5c75ff41a86ed0051b04fa99f02 /python/commands | |
| parent | f5408c46da630d308f6e2a80b8b228cd398b89b4 (diff) | |
| download | qpid-python-5dd3cd3ae035673bf6003b6422712663ffa57fe5.tar.gz | |
Consistent connection names across a cluster.
- use the same host:port for connections and their shadows.
- add shadow property to managment connection to identify shadows.
- updated qpid-stat and qpid-cluster to filter on shadow property.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@907123 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/commands')
| -rwxr-xr-x | python/commands/qpid-cluster | 3 | ||||
| -rwxr-xr-x | python/commands/qpid-stat | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/python/commands/qpid-cluster b/python/commands/qpid-cluster index 7afb7671b8..6d64765184 100755 --- a/python/commands/qpid-cluster +++ b/python/commands/qpid-cluster @@ -193,7 +193,6 @@ class BrokerManager: self.qmf.delBroker(self.broker) self.broker = None self.brokers = [] - pattern = re.compile("^\\d+\\.\\d+\\.\\d+\\.\\d+:\\d+$") idx = 0 for host in hostList: @@ -209,7 +208,7 @@ class BrokerManager: print "Clients on Member: ID=%s:" % displayList[idx] connList = self.qmf.getObjects(_class="connection", _package="org.apache.qpid.broker", _broker=broker) for conn in connList: - if pattern.match(conn.address): + if not conn.shadow: if self.config._numeric or self.config._delConn: a = conn.address else: diff --git a/python/commands/qpid-stat b/python/commands/qpid-stat index 29deeb2342..c6fc5ef0da 100755 --- a/python/commands/qpid-stat +++ b/python/commands/qpid-stat @@ -34,7 +34,6 @@ _types = "" _limit = 50 _increasing = False _sortcol = None -pattern = re.compile("^\\d+\\.\\d+\\.\\d+\\.\\d+:\\d+$") def Usage (): print "Usage: qpid-stat [OPTIONS] [broker-addr]" @@ -108,7 +107,7 @@ class Broker(object): list = qmf.getObjects(_class="connection", _package=package, _agent=self.brokerAgent) for conn in list: - if pattern.match(conn.address): + if not conn.shadow: self.connections[conn.getObjectId()] = conn list = qmf.getObjects(_class="session", _package=package, _agent=self.brokerAgent) |