diff options
| author | Ted Ross <tross@apache.org> | 2009-06-26 12:57:43 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2009-06-26 12:57:43 +0000 |
| commit | aa655f892b92c0295d4c97f011b05353d68b546f (patch) | |
| tree | e926440ad514a7d17566e742dd8039ddf4db6b92 /qpid/python/commands/qpid-tool | |
| parent | fa9b863c9085a1397348fb3d5aa563faa54cb213 (diff) | |
| download | qpid-python-aa655f892b92c0295d4c97f011b05353d68b546f.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@788681 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python/commands/qpid-tool')
| -rwxr-xr-x | qpid/python/commands/qpid-tool | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/python/commands/qpid-tool b/qpid/python/commands/qpid-tool index 14308f69fb..05afcc9732 100755 --- a/qpid/python/commands/qpid-tool +++ b/qpid/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. |