summaryrefslogtreecommitdiff
path: root/python/commands/qpid-tool
diff options
context:
space:
mode:
Diffstat (limited to 'python/commands/qpid-tool')
-rwxr-xr-xpython/commands/qpid-tool6
1 files changed, 4 insertions, 2 deletions
diff --git a/python/commands/qpid-tool b/python/commands/qpid-tool
index 60535c253b..05afcc9732 100755
--- a/python/commands/qpid-tool
+++ b/python/commands/qpid-tool
@@ -24,7 +24,7 @@ import getopt
import sys
import socket
from cmd import Cmd
-from qpid.connection import ConnectionFailed
+from qpid.connection import ConnectionFailed, Timeout
from qpid.managementdata import ManagementData
from shlex import split
from qpid.disp import Display
@@ -148,7 +148,7 @@ class Mcli (Cmd):
self.dataObject.close ()
def Usage ():
- print "Usage: qpid-tool [<target-host[:<tcp-port>]]"
+ print "Usage: qpid-tool [[<username>/<password>@]<target-host>[:<tcp-port>]]"
print
sys.exit (1)
@@ -183,6 +183,8 @@ except ConnectionFailed, e:
except Exception, e:
if str(e).find ("Exchange not found") != -1:
print "Management not enabled on broker: Use '-m yes' option on broker startup."
+ else:
+ print "Failed: %s - %s" % (e.__class__.__name__, e)
sys.exit(1)
# Instantiate the CLI interpreter and launch it.