summaryrefslogtreecommitdiff
path: root/python/commands/qpid-tool
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2009-06-26 12:57:43 +0000
committerTed Ross <tross@apache.org>2009-06-26 12:57:43 +0000
commit4072ab6f9e4d5eafb3ffa25cb8538dedde8360de (patch)
treec21af982e89753690e62751bb1cd74ec7d2cee7d /python/commands/qpid-tool
parent139f378983f9da23af928decab67afc0eb62c324 (diff)
downloadqpid-python-4072ab6f9e4d5eafb3ffa25cb8538dedde8360de.tar.gz
Added --timeout options to cli tools.
Cli tools will not hang indefinitely if the broker is non-responsive. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@788681 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/commands/qpid-tool')
-rwxr-xr-xpython/commands/qpid-tool4
1 files changed, 3 insertions, 1 deletions
diff --git a/python/commands/qpid-tool b/python/commands/qpid-tool
index 14308f69fb..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
@@ -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.