summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qpid/extras/qmf/src/py/qmf/console.py16
1 files changed, 4 insertions, 12 deletions
diff --git a/qpid/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py
index d198560224..f652ef5f3d 100644
--- a/qpid/extras/qmf/src/py/qmf/console.py
+++ b/qpid/extras/qmf/src/py/qmf/console.py
@@ -2221,18 +2221,10 @@ class Broker(Thread):
return True # connection complete
- except socket.error, e:
- self.error = "Socket Error %s - %s" % (e.__class__.__name__, e)
- except Closed, e:
- self.error = "Connect Failed %s - %s" % (e.__class__.__name__, e)
- except ConnectionFailed, e:
- self.error = "Connect Failed %s - %s" % (e.__class__.__name__, e)
- except:
- e = Exception("Unknown connection exception")
- self.error = str(e)
-
- self.conn_exc = e
- return False # connection failed
+ except Exception, e:
+ self.error = "Exception during connection setup: %s - %s" % (e.__class__.__name__, e)
+ self.conn_exc = e
+ return False # connection failed
def _updateAgent(self, obj):
bankKey = str(obj.agentBank)