diff options
Diffstat (limited to 'oslo_messaging/_drivers/amqp.py')
| -rw-r--r-- | oslo_messaging/_drivers/amqp.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/oslo_messaging/_drivers/amqp.py b/oslo_messaging/_drivers/amqp.py index 0648b1e..ebae514 100644 --- a/oslo_messaging/_drivers/amqp.py +++ b/oslo_messaging/_drivers/amqp.py @@ -27,10 +27,10 @@ import collections import logging import uuid +from oslo_config import cfg +from oslo_utils import strutils import six -from oslo.config import cfg -from oslo.utils import strutils from oslo_messaging._drivers import common as rpc_common from oslo_messaging._drivers import pool @@ -42,11 +42,13 @@ amqp_opts = [ help='Use durable queues in AMQP.'), cfg.BoolOpt('amqp_auto_delete', default=False, + deprecated_group='DEFAULT', help='Auto-delete queues in AMQP.'), # FIXME(markmc): this was toplevel in openstack.common.rpc cfg.IntOpt('rpc_conn_pool_size', default=30, + deprecated_group='DEFAULT', help='Size of RPC connection pool.'), ] @@ -56,11 +58,11 @@ LOG = logging.getLogger(__name__) class ConnectionPool(pool.Pool): """Class that implements a Pool of Connections.""" - def __init__(self, conf, url, connection_cls): + def __init__(self, conf, rpc_conn_pool_size, url, connection_cls): self.connection_cls = connection_cls self.conf = conf self.url = url - super(ConnectionPool, self).__init__(self.conf.rpc_conn_pool_size) + super(ConnectionPool, self).__init__(rpc_conn_pool_size) self.reply_proxy = None # TODO(comstud): Timeout connections not used in a while |