QPID-4139 - qpid-stat -b does not show broker names anymore

Applied patch from Ernie Allen


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1397218 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 0 deletions

diff --git a/qpid/tools/src/py/qpid-stat b/qpid/tools/src/py/qpid-stat
index 458ae36182..0506c084a4 100755
--- a/qpid/tools/src/py/qpid-stat
+++ b/qpid/tools/src/py/qpid-stat
@@ -200,17 +200,21 @@ class BrokerManager:
         disp = Display(prefix="  ")
         heads = []
         heads.append(Header('uptime', Header.DURATION))
+        heads.append(Header('cluster', Header.NONE))
         heads.append(Header('connections', Header.COMMAS))
         heads.append(Header('sessions', Header.COMMAS))
         heads.append(Header('exchanges', Header.COMMAS))
         heads.append(Header('queues', Header.COMMAS))
         rows = []
         broker = self.broker.getBroker()
+        cluster = self.broker.getCluster()
+        clusterInfo = cluster and cluster.clusterName + "<" + cluster.status + ">" or "<standalone>"
         connections = self.getConnectionMap()
         sessions = self.getSessionMap()
         exchanges = self.getExchangeMap()
         queues = self.getQueueMap()
         row = (broker.getUpdateTime() - broker.getCreateTime(),
+               clusterInfo,
                len(connections), len(sessions),
                len(exchanges), len(queues))
         rows.append(row)