openstack/deb-python-oslo.messaging
Code Issues Proposed changes

Merge "Ensure rpc_response_timeout is registered before using it"

Browse Source
This commit is contained in:
Jenkins
2015-06-02 22:49:13 +00:00
committed by Gerrit Code Review
parent 27efb36b87 887e5a0423
commit 5b4038ce37
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
oslo_messaging/_drivers/impl_rabbit.py
View File

@@ -41,6 +41,7 @@ from oslo_messaging._i18n import _LE
from oslo_messaging._i18n import _LI from oslo_messaging._i18n import _LI
from oslo_messaging._i18n import _LW from oslo_messaging._i18n import _LW
from oslo_messaging import exceptions from oslo_messaging import exceptions
from oslo_messaging.rpc import client as rpc_client
rabbit_opts = [ rabbit_opts = [
@@ -1002,6 +1003,12 @@ class Connection(object):
RuntimeError("_publish_and_retry_on_missing_exchange() must be " RuntimeError("_publish_and_retry_on_missing_exchange() must be "
"called with an passive exchange.") "called with an passive exchange.")
# FIXME(dhellmann): This is a hack to make sure the option
# we're about to use is registered. Since we're not going
# through a Client object here, it won't be registered by
# Client.__init__. We should do this more cleanly.
self.conf.register_opts(rpc_client._client_opts)
# TODO(sileht): use @retrying # TODO(sileht): use @retrying
# NOTE(sileht): no need to wait the application expect a response # NOTE(sileht): no need to wait the application expect a response
# before timeout is exshauted # before timeout is exshauted