diff options
author | Alan Conway <aconway@apache.org> | 2011-03-01 15:58:50 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2011-03-01 15:58:50 +0000 |
commit | d8adc4781166de72d1185acaf88ddd502d160015 (patch) | |
tree | aa74cf094fa572eab7169019248e1ee52908aa2e /qpid/tools | |
parent | d67b9f0ea39e56c224da39042b0fc35d29c2d679 (diff) | |
download | qpid-python-d8adc4781166de72d1185acaf88ddd502d160015.tar.gz |
NO-JIRA: fix qpid-printevents to work on python 2.4.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1075862 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/tools')
-rwxr-xr-x | qpid/tools/src/py/qpid-printevents | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/qpid/tools/src/py/qpid-printevents b/qpid/tools/src/py/qpid-printevents index 2be2f0be8b..d56d2899b1 100755 --- a/qpid/tools/src/py/qpid-printevents +++ b/qpid/tools/src/py/qpid-printevents @@ -20,7 +20,7 @@ # import os -import optparse +import optparse from optparse import IndentedHelpFormatter import sys import socket @@ -62,11 +62,11 @@ _usage = "%prog [options] [broker-addr]..." _description = \ """ -Collect and print events from one or more Qpid message brokers. +Collect and print events from one or more Qpid message brokers. If no broker-addr is supplied, %prog connects to 'localhost:5672'. -[broker-addr] syntax: +[broker-addr] syntax: [username/password@] hostname ip-address [:<port>] @@ -91,20 +91,20 @@ def main(argv=None): session = Session(console, rcvObjects=False, rcvHeartbeats=options.heartbeats, manageConnections=True) brokers = [] try: - for host in arguments: - brokers.append(session.addBroker(host, None, options.sasl_mechanism)) + try: + for host in arguments: + brokers.append(session.addBroker(host, None, options.sasl_mechanism)) - while (True): - sleep(10) + while (True): + sleep(10) - except KeyboardInterrupt: - print - return 0 - - except Exception, e: - print "Failed: %s - %s" % (e.__class__.__name__, e) - return 1 + except KeyboardInterrupt: + print + return 0 + except Exception, e: + print "Failed: %s - %s" % (e.__class__.__name__, e) + return 1 finally: while len(brokers): b = brokers.pop() |