openstack/oslo.messaging
Code Issues Proposed changes

Merge "Refactor AMQP message broker selection"

Browse Source
This commit is contained in:
Jenkins 2014-03-28 16:01:21 +00:00 committed by Gerrit Code Review
commit 85ea502edf
2 changed files with 4 additions and 10 deletions
oslo/messaging/_drivers
impl_qpid.pyimpl_rabbit.py

7
oslo/messaging/_drivers/impl_qpid.py

@ -473,10 +473,7 @@ class Connection(object):
}
params.update(server_params or {})
self.brokers = params['qpid_hosts']
brokers_count = len(self.brokers)
self.next_broker_indices = itertools.cycle(range(brokers_count))
self.brokers = itertools.cycle(params['qpid_hosts'])
self.username = params['username']
self.password = params['password']
@ -515,7 +512,7 @@ class Connection(object):
except qpid_exceptions.ConnectionError:
pass
broker = self.brokers[next(self.next_broker_indices)]
broker = six.next(self.brokers)
try:
self.connection_create(broker)

7
oslo/messaging/_drivers/impl_rabbit.py

@ -466,10 +466,7 @@ class Connection(object):
params_list.append(params)
self.params_list = params_list
brokers_count = len(self.params_list)
self.next_broker_indices = itertools.cycle(range(brokers_count))
self.params_list = itertools.cycle(params_list)
self.memory_transport = self.conf.fake_rabbit
@ -575,7 +572,7 @@ class Connection(object):
attempt = 0
while True:
params = self.params_list[next(self.next_broker_indices)]
params = six.next(self.params_list)
attempt += 1
try:
self._connect(params)