Author: tross
Date: Fri May 23 06:29:42 2008
New Revision: 659535
URL: http://svn.apache.org/viewvc?rev=659535&view=rev
Log:
qpid-tool fixed to cleanly handle brokers with management disabled
Modified:
incubator/qpid/trunk/qpid/python/commands/qpid-tool
incubator/qpid/trunk/qpid/python/qpid/managementdata.py
Modified: incubator/qpid/trunk/qpid/python/commands/qpid-tool
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-tool?rev=659535&r1=659534&r2=659535&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/commands/qpid-tool (original)
+++ incubator/qpid/trunk/qpid/python/commands/qpid-tool Fri May 23 06:29:42 2008
@@ -164,16 +164,16 @@
except socket.error, e:
print "Socket Error (%s):" % _host, e[1]
sys.exit (1)
-except Closed, e:
- if str(e).find ("Exchange not found") != -1:
- print "Management not enabled on broker: Use '-m yes' option on broker
startup."
- sys.exit (1)
except IOError, e:
print "IOError: %d - %s: %s" % (e.errno, e.strerror, e.filename)
sys.exit (1)
except ConnectionFailed, e:
print "Connect Failed %d - %s" % (e[0], e[1])
sys.exit(1)
+except Exception, e:
+ if str(e).find ("Exchange not found") != -1:
+ print "Management not enabled on broker: Use '-m yes' option on broker
startup."
+ sys.exit(1)
# Instantiate the CLI interpreter and launch it.
cli = Mcli (data, disp)
Modified: incubator/qpid/trunk/qpid/python/qpid/managementdata.py
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/managementdata.py?rev=659535&r1=659534&r2=659535&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/managementdata.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/managementdata.py Fri May 23 06:29:42
2008
@@ -163,7 +163,8 @@
self.lock.release ()
def closeHandler (self, context, reason):
- print "Connection to broker lost:", reason
+ if self.operational:
+ print "Connection to broker lost:", reason
self.operational = False
if self.cli != None:
self.cli.setPromptMessage ("Broker Disconnected")
@@ -181,7 +182,9 @@
self.tables = {}
self.schema = {}
self.bootSequence = 0
+ self.operational = False
self.disp = disp
+ self.cli = None
self.lastUnit = None
self.methodSeq = 1
self.methodsPending = {}
@@ -198,7 +201,6 @@
self.mclient.schemaListener (self.schemaHandler)
self.mch = self.mclient.addChannel (self.conn.session(self.sessionId))
self.operational = True
- self.cli = None
def close (self):
pass
