openstack
/
oslo.messaging
Code Issues Proposed changes

Remove unuseful param of the ConnectionContext 

The ConnectionContext depends on the ConnectionPool.
A ConnectionPool already known the connection classes,
the configuration object and the url needed to create a new connection.

But we pass again thoses informations when we create a ConnectionContext.
This is unuseful, we can reuse thoses in the connection pool even we
want a not pooled connection.

This change removes the unuseful ConnectionContext parameters,
this also ensures that connection created with or without the pool
are created in the same ways and only at one place (the create method
of the connection pool).

Change-Id: I4bd43d202fa2774ad5dcb0f8dd05e58ba60c6009
This commit is contained in:
Mehdi Abaakouk 2014-09-17 10:58:08 +02:00
parent 6eb0d2ff80
commit 7306680bfa
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oslo/messaging/_drivers/amqp.py
View File

@ -107,16 +107,15 @@ class ConnectionContext(rpc_common.Connection):
If possible the function makes sure to return a connection to the pool.
"""
def __init__(self, conf, url, connection_pool, pooled=True):
def __init__(self, connection_pool, pooled=True):
"""Create a new connection, or get one from the pool."""
self.connection = None
self.conf = conf
self.url = url
self.connection_pool = connection_pool
if pooled:
self.connection = connection_pool.get()
else:
self.connection = connection_pool.connection_cls(conf, url)
# a non-pooled connection is requested, so create a new connection
self.connection = connection_pool.create()
self.pooled = pooled
def __enter__(self):

4
oslo/messaging/_drivers/amqpdriver.py
View File

@ -330,9 +330,7 @@ class AMQPDriverBase(base.BaseDriver):
return target.exchange or self._default_exchange
def _get_connection(self, pooled=True):
return rpc_amqp.ConnectionContext(self.conf,
self._url,
self._connection_pool,
return rpc_amqp.ConnectionContext(self._connection_pool,
pooled=pooled)
def _get_reply_q(self):