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 | 4072ab6f9e4d5eafb3ffa25cb8538dedde8360de (patch) | |
| tree | c21af982e89753690e62751bb1cd74ec7d2cee7d /python/commands/qpid-route | |
| parent | 139f378983f9da23af928decab67afc0eb62c324 (diff) | |
| download | qpid-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-route')
| -rwxr-xr-x | python/commands/qpid-route | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/python/commands/qpid-route b/python/commands/qpid-route index 324ce2e176..b515b91267 100755 --- a/python/commands/qpid-route +++ b/python/commands/qpid-route @@ -43,6 +43,7 @@ def Usage(): print " qpid-route [OPTIONS] link list [<dest-broker>]" print print "Options:" + print " --timeout seconds (10) Maximum time to wait for broker connection" print " -v [ --verbose ] Verbose output" print " -q [ --quiet ] Quiet output, don't print duplicate warnings" print " -d [ --durable ] Added configuration shall be durable" @@ -64,13 +65,14 @@ _dellink = False _srclocal = False _transport = "tcp" _ack = 0 +_connTimeout = 10 class RouteManager: def __init__(self, localBroker): self.local = BrokerURL(localBroker) self.remote = None self.qmf = Session() - self.broker = self.qmf.addBroker(localBroker) + self.broker = self.qmf.addBroker(localBroker, _connTimeout) def disconnect(self): self.qmf.delBroker(self.broker) @@ -143,7 +145,7 @@ class RouteManager: if url.name() not in brokerList: print " %s..." % url.name(), try: - b = qmf.addBroker("%s:%d" % (link.host, link.port)) + b = qmf.addBroker("%s:%d" % (link.host, link.port), _connTimeout) brokerList[url.name()] = b added = True print "Ok" @@ -403,7 +405,7 @@ def YN(val): ## try: - longOpts = ("verbose", "quiet", "durable", "del-empty-link", "src-local", "transport=", "ack=") + longOpts = ("verbose", "quiet", "durable", "del-empty-link", "src-local", "transport=", "ack=", "timeout=") (optlist, encArgs) = getopt.gnu_getopt(sys.argv[1:], "vqdest:", longOpts) except: Usage() @@ -415,6 +417,10 @@ except: cargs = encArgs for opt in optlist: + if opt[0] == "--timeout": + _connTimeout = int(opt[1]) + if _connTimeout == 0: + _connTimeout = None if opt[0] == "-v" or opt[0] == "--verbose": _verbose = True if opt[0] == "-q" or opt[0] == "--quiet": @@ -512,7 +518,7 @@ try: Usage() except Exception,e: - print "Failed:", e.args + print "Failed: %s - %s" % (e.__class__.__name__, e) sys.exit(1) rm.disconnect() |