openstack/oslo.messaging
Code Issues Proposed changes

Merge "[zmq] Properly analyse use_dynamic_connections option"

Browse Source
This commit is contained in:
Jenkins 2017-02-10 19:13:08 +00:00 committed by Gerrit Code Review
commit 337f499c58
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oslo_messaging/_drivers/zmq_driver/client/zmq_client.py
View File

@ -38,16 +38,20 @@ class ZmqClientMixDirectPubSub(zmq_client_base.ZmqClientBase):
conf.oslo_messaging_zmq.use_pub_sub: conf.oslo_messaging_zmq.use_pub_sub:
raise WrongClientException() raise WrongClientException()
publisher_direct = self._create_publisher_direct(conf, matchmaker) publisher = self._create_publisher_direct_dynamic(conf, matchmaker) \
if conf.oslo_messaging_zmq.use_dynamic_connections else \
self._create_publisher_direct(conf, matchmaker)
publisher_proxy = self._create_publisher_proxy_dynamic(conf, publisher_proxy = self._create_publisher_proxy_dynamic(conf,
matchmaker) matchmaker) \
if conf.oslo_messaging_zmq.use_dynamic_connections else \
self._create_publisher_proxy(conf, matchmaker)
super(ZmqClientMixDirectPubSub, self).__init__( super(ZmqClientMixDirectPubSub, self).__init__(
conf, matchmaker, allowed_remote_exmods, conf, matchmaker, allowed_remote_exmods,
publishers={ publishers={
zmq_names.CAST_FANOUT_TYPE: publisher_proxy, zmq_names.CAST_FANOUT_TYPE: publisher_proxy,
zmq_names.NOTIFY_TYPE: publisher_proxy, zmq_names.NOTIFY_TYPE: publisher_proxy,
"default": publisher_direct "default": publisher
} }
) )