summaryrefslogtreecommitdiff
path: root/qpid
diff options
context:
space:
mode:
authorKenneth Anthony Giusti <kgiusti@apache.org>2010-07-20 17:44:00 +0000
committerKenneth Anthony Giusti <kgiusti@apache.org>2010-07-20 17:44:00 +0000
commite4b76727f306fef1409dfed56f63dd67e7e1e7b2 (patch)
tree15f8af7e4cae0e3cebf2d0e5d93cd03d2ee339f9 /qpid
parentb9b8004b7b13530d70502f0cf947037a6c265525 (diff)
downloadqpid-python-e4b76727f306fef1409dfed56f63dd67e7e1e7b2.tar.gz
QMF: bugfix - save the exception object generated on broker connection setup failure.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@965927 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-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)