openstack/oslo.messaging
Code Issues Proposed changes

Merge "Add if condition for random.shuffle"

Browse Source
This commit is contained in:
Jenkins 2015-10-17 03:20:23 +00:00 committed by Gerrit Code Review
commit ac1cb20e0d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_messaging/_drivers/impl_rabbit.py
View File

@ -407,7 +407,8 @@ class Connection(object):
LOG.warn(_LW('Selecting the kombu transport through the ' LOG.warn(_LW('Selecting the kombu transport through the '
'transport url (%s) is a experimental feature ' 'transport url (%s) is a experimental feature '
'and this is not yet supported.') % url.transport) 'and this is not yet supported.') % url.transport)
random.shuffle(url.hosts) if len(url.hosts) > 1:
random.shuffle(url.hosts)
for host in url.hosts: for host in url.hosts:
transport = url.transport.replace('kombu+', '') transport = url.transport.replace('kombu+', '')
transport = transport.replace('rabbit', 'amqp') transport = transport.replace('rabbit', 'amqp')
@ -425,7 +426,8 @@ class Connection(object):
transport = url.transport.replace('kombu+', '') transport = url.transport.replace('kombu+', '')
self._url = "%s://%s" % (transport, virtual_host) self._url = "%s://%s" % (transport, virtual_host)
else: else:
random.shuffle(self.rabbit_hosts) if len(self.rabbit_hosts) > 1:
random.shuffle(self.rabbit_hosts)
for adr in self.rabbit_hosts: for adr in self.rabbit_hosts:
hostname, port = netutils.parse_host_port( hostname, port = netutils.parse_host_port(
adr, default_port=self.rabbit_port) adr, default_port=self.rabbit_port)