diff --git a/oslo/messaging/_drivers/impl_qpid.py b/oslo/messaging/_drivers/impl_qpid.py index fd36acff..a8881adb 100644 --- a/oslo/messaging/_drivers/impl_qpid.py +++ b/oslo/messaging/_drivers/impl_qpid.py @@ -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: diff --git a/oslo/messaging/_drivers/impl_rabbit.py b/oslo/messaging/_drivers/impl_rabbit.py index cfd506d6..fee4611b 100644 --- a/oslo/messaging/_drivers/impl_rabbit.py +++ b/oslo/messaging/_drivers/impl_rabbit.py @@ -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)