openstack/deb-aodh
Code Issues Proposed changes

Update oslo before bringing in exceptions

Browse Source 
I want to bring in the base OpenstackException for
the alarm api, so first updating what we currently have.

Change-Id: I8128f3420eac9ab42a9d679c7b291bac1f27e5b0
This commit is contained in:
Angus Salkeld
2013-05-01 18:16:48 +10:00
parent 7dfd84690c
commit 5cb2f9caba
18 changed files with 349 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometer/openstack/common/rpc/impl_kombu.py
View File

@@ -176,7 +176,7 @@ class ConsumerBase(object):
"""Cancel the consuming from the queue, if it has started"""
try:
self.queue.cancel(self.tag)
except KeyError, e:
except KeyError as e:
# NOTE(comstud): Kludge to get around a amqplib bug
if str(e) != "u'%s'" % self.tag:
raise
@@ -520,7 +520,7 @@ class Connection(object):
return
except (IOError, self.connection_errors) as e:
pass
except Exception, e:
except Exception as e:
# NOTE(comstud): Unfortunately it's possible for amqplib
# to return an error not covered by its transport
# connection_errors in the case of a timeout waiting for
@@ -561,10 +561,10 @@ class Connection(object):
while True:
try:
return method(*args, **kwargs)
except (self.connection_errors, socket.timeout, IOError), e:
except (self.connection_errors, socket.timeout, IOError) as e:
if error_callback:
error_callback(e)
except Exception, e:
except Exception as e:
# NOTE(comstud): Unfortunately it's possible for amqplib
# to return an error not covered by its transport
# connection_errors in the case of a timeout waiting for