From 604d8ea7ba6a4de584298dfd975764b3f666843e Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 24 Mar 2014 18:16:40 +0000 Subject: QPID-4738: Fix qpid-ha status --all when used with a standalone broker. Previously qpid-ha status --all on a standalone broker produced no output. Now it prints the status of the standalone broker. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580962 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/tools/src/py/qpid-ha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qpid/tools/src/py/qpid-ha b/qpid/tools/src/py/qpid-ha index daa73d3312..8850a12adb 100755 --- a/qpid/tools/src/py/qpid-ha +++ b/qpid/tools/src/py/qpid-ha @@ -106,9 +106,9 @@ class StatusCmd(Command): if not ha_broker.status in ["active", "recovering"]: raise ExitStatus(1) if opts.expect: if opts.expect != ha_broker.status: raise ExitStatus(1) - if opts.all: + brokers = filter(None, re.sub(r'(^amqps?:)|(tcp:)', "", ha_broker.brokersUrl).split(",")) + if opts.all and brokers: opts.all=False - brokers = re.sub(r'(^amqp:)|(tcp:)', "", ha_broker.brokersUrl).split(",") for b in brokers: opts.broker = b try: -- cgit v1.2.1