diff options
| -rwxr-xr-x | python/commands/qpid-tool | 8 | ||||
| -rw-r--r-- | python/qpid/managementdata.py | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/python/commands/qpid-tool b/python/commands/qpid-tool index 478e362aaf..bf16faac42 100755 --- a/python/commands/qpid-tool +++ b/python/commands/qpid-tool @@ -164,16 +164,16 @@ try: 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) diff --git a/python/qpid/managementdata.py b/python/qpid/managementdata.py index b04a58ddac..a0fa1ece64 100644 --- a/python/qpid/managementdata.py +++ b/python/qpid/managementdata.py @@ -163,7 +163,8 @@ class ManagementData: 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 @@ class ManagementData: 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 @@ class ManagementData: 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 |