5d7d7253d1
Current Listener interface has poll() method which return messages To use it we need have poller thread which is located in MessageHandlerServer But my investigations of existing driver's code shows that some implemetations have its own thread inside for processing connection event loop. This event loop received messages and store in queue object. And then our poller's thread reads this queue This situation can be improved. we can remove poller's thread, remove queue object and just call on_message server's callback from connection eventloop thread This path provide posibility to do this for one of drivers and leave as is other drivers Change-Id: I3e3d4369d8fdadcecf079d10af58b1e4f5616047
97 lines
3.2 KiB
Python
97 lines
3.2 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.
|
|
|
|
import copy
|
|
import logging
|
|
|
|
from oslo_messaging._drivers import base
|
|
from oslo_messaging._drivers.zmq_driver.server.consumers\
|
|
import zmq_router_consumer
|
|
from oslo_messaging._drivers.zmq_driver.server.consumers\
|
|
import zmq_sub_consumer
|
|
from oslo_messaging._drivers.zmq_driver import zmq_async
|
|
from oslo_messaging._i18n import _LI
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
zmq = zmq_async.import_zmq()
|
|
|
|
|
|
class ZmqServer(base.PollStyleListener):
|
|
|
|
def __init__(self, driver, conf, matchmaker, target, poller=None):
|
|
super(ZmqServer, self).__init__()
|
|
self.driver = driver
|
|
self.conf = conf
|
|
self.matchmaker = matchmaker
|
|
self.target = target
|
|
self.poller = poller or zmq_async.get_poller()
|
|
self.router_consumer = zmq_router_consumer.RouterConsumer(
|
|
conf, self.poller, self)
|
|
self.sub_consumer = zmq_sub_consumer.SubConsumer(
|
|
conf, self.poller, self) if conf.use_pub_sub else None
|
|
|
|
self.consumers = [self.router_consumer]
|
|
if self.sub_consumer:
|
|
self.consumers.append(self.sub_consumer)
|
|
|
|
@base.batch_poll_helper
|
|
def poll(self, timeout=None):
|
|
message, socket = self.poller.poll(
|
|
timeout or self.conf.rpc_poll_timeout)
|
|
return message
|
|
|
|
def stop(self):
|
|
consumer = self.router_consumer
|
|
LOG.info(_LI("Stop server %(address)s:%(port)s"),
|
|
{'address': consumer.address, 'port': consumer.port})
|
|
|
|
def cleanup(self):
|
|
self.poller.close()
|
|
for consumer in self.consumers:
|
|
consumer.cleanup()
|
|
|
|
|
|
class ZmqNotificationServer(base.PollStyleListener):
|
|
|
|
def __init__(self, driver, conf, matchmaker, targets_and_priorities):
|
|
super(ZmqNotificationServer, self).__init__()
|
|
self.driver = driver
|
|
self.conf = conf
|
|
self.matchmaker = matchmaker
|
|
self.servers = []
|
|
self.poller = zmq_async.get_poller()
|
|
self._listen(targets_and_priorities)
|
|
|
|
def _listen(self, targets_and_priorities):
|
|
for target, priority in targets_and_priorities:
|
|
t = copy.deepcopy(target)
|
|
t.topic = target.topic + '.' + priority
|
|
self.servers.append(ZmqServer(
|
|
self.driver, self.conf, self.matchmaker, t, self.poller))
|
|
|
|
@base.batch_poll_helper
|
|
def poll(self, timeout=None):
|
|
message, socket = self.poller.poll(
|
|
timeout or self.conf.rpc_poll_timeout)
|
|
return message
|
|
|
|
def stop(self):
|
|
for server in self.servers:
|
|
server.stop()
|
|
|
|
def cleanup(self):
|
|
for server in self.servers:
|
|
server.cleanup()
|