summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-05 16:53:56 +0000
committerGerrit Code Review <review@openstack.org>2012-01-05 16:53:56 +0000
commitd7887419f4e28cd948e3bdd8644f5e329a81695c (patch)
treefe2cc694651e386f9807333f320f26b8d4454bb5
parent1aa34d4538f071386813d646d707364eb6c788bc (diff)
parent7edbac2015c5de129aa87f72ff0dad91342655ba (diff)
Merge "Remove small unneeded code from impl_kombu"
-rw-r--r--nova/rpc/impl_kombu.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index 5f47737d0..82eb651de 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -449,7 +449,6 @@ class Connection(object):
def publisher_send(self, cls, topic, msg, **kwargs):
"""Send to a publisher based on the publisher class"""
while True:
- publisher = None
try:
publisher = cls(self.channel, topic, **kwargs)
publisher.send(msg)
@@ -458,8 +457,6 @@ class Connection(object):
LOG.exception(_('Failed to publish message %s' % str(e)))
try:
self.reconnect()
- if publisher:
- publisher.reconnect(self.channel)
except self.connection.connection_errors, e:
pass