summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-02 22:49:13 +0000
committerGerrit Code Review <review@openstack.org>2015-06-02 22:49:13 +0000
commit5b4038ce37a63befce191007fc3a71a6d917e0e7 (patch)
treed70d798edbb049deb3aae26f1c4c1ace996d14a4
parent27efb36b87f42e4f9162bb4f7fe5d83a5cd557e4 (diff)
parent887e5a042359ed2b424d6e079f13d460213eeff6 (diff)
downloadoslo-messaging-1.12.1.tar.gz
Merge "Ensure rpc_response_timeout is registered before using it"1.13.01.12.1
-rw-r--r--oslo_messaging/_drivers/impl_rabbit.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index 87fb07c..73902bf 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -41,6 +41,7 @@ from oslo_messaging._i18n import _LE
from oslo_messaging._i18n import _LI
from oslo_messaging._i18n import _LW
from oslo_messaging import exceptions
+from oslo_messaging.rpc import client as rpc_client
rabbit_opts = [
@@ -1002,6 +1003,12 @@ class Connection(object):
RuntimeError("_publish_and_retry_on_missing_exchange() must be "
"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
# NOTE(sileht): no need to wait the application expect a response
# before timeout is exshauted