openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "rabbit/qpid: remove the args/kwargs from ensure()"

This commit is contained in:
Jenkins 2014-06-14 23:20:15 +00:00 committed by Gerrit Code Review
parent f471daa8f0 d7b85a1492
commit f2cd28e503
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oslo/messaging/_drivers/impl_qpid.py
View File

@ -573,10 +573,10 @@ class Connection(object):
LOG.debug("Re-established AMQP queues")
def ensure(self, error_callback, method, retry=None, *args, **kwargs):
def ensure(self, error_callback, method, retry=None):
while True:
try:
return method(*args, **kwargs)
return method()
except (qpid_exceptions.Empty,
qpid_exceptions.MessagingError) as e:
if error_callback:

4
oslo/messaging/_drivers/impl_rabbit.py
View File

@ -645,10 +645,10 @@ class Connection(object):
'%(sleep_time)d seconds.') % log_info)
time.sleep(sleep_time)
def ensure(self, error_callback, method, retry=None, *args, **kwargs):
def ensure(self, error_callback, method, retry=None):
while True:
try:
return method(*args, **kwargs)
return method()
except self.connection_errors as e:
if error_callback:
error_callback(e)