diff options
| author | dukhlov <dukhlov@mirantis.com> | 2016-02-20 11:31:15 -0500 |
|---|---|---|
| committer | Dmitriy Ukhlov <dukhlov@mirantis.com> | 2016-02-23 15:00:58 +0000 |
| commit | 1482687ff7f06b8db49b6f604e7be0db8eafe2df (patch) | |
| tree | 7e05dfba559c08c1416a4ae24464fde3d06a4107 /oslo_messaging/opts.py | |
| parent | 92c4f76c797f121bec11e53e7895909807d9ba1d (diff) | |
| download | oslo-messaging-1482687ff7f06b8db49b6f604e7be0db8eafe2df.tar.gz | |
Move server's logic from executors
Now we have situation when openstack projects like Mistral needs
extra oslo.messaging functionality.
But it is too complicated now to to implement something new and
integrate it with current code because there is a little bit mess.
1) Executor should be responsible for how to run jobs
(but now also has code with server logic)
2) Dispatcher should be responsible for routing message to the
target endpoint for processing (but it also has serialisation, sending replies,
executing some executor's callbacks etc)
3) Server should do all server specific logic, we need to have different
implementation of servers for RPC and notification, not different implementations
of dispatchers
This patch fixes 1-st point
Change-Id: Ib6408f408889bb7b7056722be636a5547b1a780d
Diffstat (limited to 'oslo_messaging/opts.py')
| -rw-r--r-- | oslo_messaging/opts.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/oslo_messaging/opts.py b/oslo_messaging/opts.py index 2ee0318..eb0878d 100644 --- a/oslo_messaging/opts.py +++ b/oslo_messaging/opts.py @@ -22,19 +22,21 @@ import itertools from oslo_messaging._drivers import amqp from oslo_messaging._drivers import base as drivers_base +from oslo_messaging._drivers import impl_pika from oslo_messaging._drivers import impl_rabbit from oslo_messaging._drivers import impl_zmq from oslo_messaging._drivers.protocols.amqp import opts as amqp_opts from oslo_messaging._drivers.zmq_driver.matchmaker import matchmaker_redis -from oslo_messaging._executors import impl_pooledexecutor from oslo_messaging.notify import notifier from oslo_messaging.rpc import client +from oslo_messaging import server from oslo_messaging import transport + _global_opt_lists = [ drivers_base.base_opts, impl_zmq.zmq_opts, - impl_pooledexecutor._pool_opts, + server._pool_opts, client._client_opts, transport._transport_opts, ] @@ -44,8 +46,10 @@ _opts = [ ('matchmaker_redis', matchmaker_redis.matchmaker_redis_opts), ('oslo_messaging_amqp', amqp_opts.amqp1_opts), ('oslo_messaging_notifications', notifier._notifier_opts), - ('oslo_messaging_rabbit', list(itertools.chain(amqp.amqp_opts, - impl_rabbit.rabbit_opts))), + ('oslo_messaging_rabbit', list( + itertools.chain(amqp.amqp_opts, impl_rabbit.rabbit_opts, + impl_pika.pika_opts, impl_pika.pika_pool_opts, + impl_pika.notification_opts, impl_pika.rpc_opts))), ] |