b5955b6ca9
In this change router was redesigned in a way most appropriate for routing concept of zmq.ROUTER socket. DEALER(cli)-ROUTER(proxy)-DEALER(srv) instead of DEALER-ROUTER-DEALER-ROUTER (3 layers instead of 4) The main reason is to use zmq.DEALER identity in message routing. For this reason DealerConsumer was introduced server-side. RouterConsumer is left for peer-to-peer DEALER-ROUTER deployment option. Also handled assertions in receive-methods in order to not stop server when received message with wrong format. Change-Id: If25edf500fa8d220d4233bb13d67121824e841c6 Closes-Bug: #1558601 Related-Bug: #1555007
73 lines
2.8 KiB
Python
73 lines
2.8 KiB
Python
# Copyright 2015 Mirantis, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
|
|
from oslo_messaging._drivers.zmq_driver.client.publishers.dealer \
|
|
import zmq_dealer_call_publisher
|
|
from oslo_messaging._drivers.zmq_driver.client.publishers.dealer \
|
|
import zmq_dealer_publisher
|
|
from oslo_messaging._drivers.zmq_driver.client.publishers.dealer \
|
|
import zmq_dealer_publisher_proxy
|
|
from oslo_messaging._drivers.zmq_driver.client.publishers \
|
|
import zmq_publisher_base
|
|
from oslo_messaging._drivers.zmq_driver.client import zmq_client_base
|
|
from oslo_messaging._drivers.zmq_driver import zmq_async
|
|
from oslo_messaging._drivers.zmq_driver import zmq_names
|
|
|
|
zmq = zmq_async.import_zmq()
|
|
|
|
|
|
class ZmqClient(zmq_client_base.ZmqClientBase):
|
|
|
|
def __init__(self, conf, matchmaker=None, allowed_remote_exmods=None):
|
|
|
|
self.sockets_manager = zmq_publisher_base.SocketsManager(
|
|
conf, matchmaker, zmq.ROUTER, zmq.DEALER)
|
|
|
|
default_publisher = zmq_dealer_publisher.DealerPublisher(
|
|
conf, matchmaker)
|
|
|
|
publisher_to_proxy = zmq_dealer_publisher_proxy.DealerPublisherProxy(
|
|
conf, matchmaker, self.sockets_manager.get_socket_to_publishers())
|
|
|
|
call_publisher = zmq_dealer_publisher_proxy.DealerCallPublisherProxy(
|
|
conf, matchmaker, self.sockets_manager) if conf.use_router_proxy \
|
|
else zmq_dealer_call_publisher.DealerCallPublisher(
|
|
conf, matchmaker, self.sockets_manager)
|
|
|
|
cast_publisher = publisher_to_proxy if conf.use_router_proxy \
|
|
else zmq_dealer_publisher.DealerPublisherAsync(
|
|
conf, matchmaker)
|
|
|
|
fanout_publisher = publisher_to_proxy \
|
|
if conf.use_pub_sub else default_publisher
|
|
|
|
super(ZmqClient, self).__init__(
|
|
conf, matchmaker, allowed_remote_exmods,
|
|
publishers={
|
|
zmq_names.CALL_TYPE: call_publisher,
|
|
|
|
zmq_names.CAST_TYPE: cast_publisher,
|
|
|
|
# Here use DealerPublisherLight for sending request to proxy
|
|
# which finally uses PubPublisher to send fanout in case of
|
|
# 'use_pub_sub' option configured.
|
|
zmq_names.CAST_FANOUT_TYPE: fanout_publisher,
|
|
|
|
zmq_names.NOTIFY_TYPE: fanout_publisher,
|
|
|
|
"default": default_publisher
|
|
}
|
|
)
|