From d8b6bb0884fcb1145c57a780543a0b7fe65a3a52 Mon Sep 17 00:00:00 2001
From: Oleksii Zamiatin <ozamiatin@mirantis.com>
Date: Tue, 7 Jun 2016 16:56:10 +0300
Subject: [PATCH] [zmq] Fix backend router port for proxy.
Incorrect value caused proxy to work only on FE socket.
Change-Id: I3dcb5eb654c2597d26c8edffcc577dc88660b577
---
.../_drivers/zmq_driver/broker/zmq_queue_proxy.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/oslo_messaging/_drivers/zmq_driver/broker/zmq_queue_proxy.py b/oslo_messaging/_drivers/zmq_driver/broker/zmq_queue_proxy.py
index c75ff4e1f..bd3e61312 100644
--- a/oslo_messaging/_drivers/zmq_driver/broker/zmq_queue_proxy.py
+++ b/oslo_messaging/_drivers/zmq_driver/broker/zmq_queue_proxy.py
@@ -51,7 +51,7 @@ class UniversalQueueProxy(object):
self.fe_router_address = zmq_address.combine_address(
self.conf.rpc_zmq_host, self.fe_router_socket.port)
self.be_router_address = zmq_address.combine_address(
- self.conf.rpc_zmq_host, self.fe_router_socket.port)
+ self.conf.rpc_zmq_host, self.be_router_socket.port)
self.pub_publisher = zmq_pub_publisher.PubPublisherProxy(
conf, matchmaker)
@@ -70,9 +70,9 @@ class UniversalQueueProxy(object):
zmq_names.NOTIFY_TYPE):
self.pub_publisher.send_request(message)
else:
- self._redirect_message(self.be_router_socket
- if socket is self.fe_router_socket
- else self.fe_router_socket, message)
+ self._redirect_message(self.be_router_socket.handle
+ if socket is self.fe_router_socket.handle
+ else self.fe_router_socket.handle, message)
@staticmethod
def _receive_in_request(socket):