Merge "rabbit/qpid: remove the args/kwargs from ensure()"
This commit is contained in:
commit
f2cd28e503
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue