openstack/oslo.messaging
Code Issues Proposed changes

Avoid unnecessary use of items()

Browse Source 
The key, value pair returned by items() wasn't used here,
so rewrite the logic to just iterate over the keys, filtered
by the type.

Change-Id: I7512ea93ac794d161a4cd9944546d6ca035a12cf
This commit is contained in:
Dirk Mueller 2018-10-28 17:29:56 +01:00
parent 13fa4f5ab1
commit 344ec5e8bb
1 changed files with 6 additions and 5 deletions

11
oslo_messaging/_drivers/impl_rabbit.py

@ -34,6 +34,7 @@ from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import eventletutils from oslo_utils import eventletutils
import six import six
import six.moves
from six.moves.urllib import parse from six.moves.urllib import parse
import oslo_messaging import oslo_messaging
@ -786,11 +787,11 @@ class Connection(object):
"""Close/release this connection.""" """Close/release this connection."""
self._heartbeat_stop() self._heartbeat_stop()
if self.connection: if self.connection:
for consumer, tag in self._consumers.items(): for consumer in six.moves.filter(lambda c: c.type == 'fanout',
if consumer.type == 'fanout': self._consumers):
LOG.debug('[connection close] Deleting fanout ' LOG.debug('[connection close] Deleting fanout '
'queue: %s ' % consumer.queue.name) 'queue: %s ' % consumer.queue.name)
consumer.queue.delete() consumer.queue.delete()
self._set_current_channel(None) self._set_current_channel(None)
self.connection.release() self.connection.release()
self.connection = None self.connection = None