From ceb2e4419fe081d096bacda9966adc705bf3dc73 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Wed, 3 Dec 2008 18:43:16 +0000 Subject: QPID-1512 - Catch only connection-related exceptions in qmf console connection thread - Added __hash__ method for UUID in qpid.datatypes git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@723008 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/qmf/console.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'qpid/python/qmf') diff --git a/qpid/python/qmf/console.py b/qpid/python/qmf/console.py index fe329db289..739ccb6b6b 100644 --- a/qpid/python/qmf/console.py +++ b/qpid/python/qmf/console.py @@ -1191,9 +1191,16 @@ class ManagedConnection(Thread): delay = self.DELAY_MIN finally: self.cv.release() - except: + except socket.error: + if delay < self.DELAY_MAX: + delay *= self.DELAY_FACTOR + except SessionDetached: if delay < self.DELAY_MAX: delay *= self.DELAY_FACTOR + except Closed: + if delay < self.DELAY_MAX: + delay *= self.DELAY_FACTOR + try: self.cv.acquire() self.cv.wait(delay) @@ -1332,13 +1339,13 @@ class Broker: except socket.error, e: self.error = "Socket Error %s - %s" % (e[0], e[1]) - raise Exception(self.error) + raise except Closed, e: self.error = "Connect Failed %d - %s" % (e[0], e[1]) - raise Exception(self.error) + raise except ConnectionFailed, e: self.error = "Connect Failed %d - %s" % (e[0], e[1]) - raise Exception(self.error) + raise def _updateAgent(self, obj): bankKey = (obj.brokerBank, obj.agentBank) -- cgit v1.2.1