Merge "Remove small unneeded code from impl_kombu"

This commit is contained in:
Jenkins
2012-01-05 16:53:56 +00:00
committed by Gerrit Code Review

View File

@@ -449,7 +449,6 @@ class Connection(object):
def publisher_send(self, cls, topic, msg, **kwargs): def publisher_send(self, cls, topic, msg, **kwargs):
"""Send to a publisher based on the publisher class""" """Send to a publisher based on the publisher class"""
while True: while True:
publisher = None
try: try:
publisher = cls(self.channel, topic, **kwargs) publisher = cls(self.channel, topic, **kwargs)
publisher.send(msg) publisher.send(msg)
@@ -458,8 +457,6 @@ class Connection(object):
LOG.exception(_('Failed to publish message %s' % str(e))) LOG.exception(_('Failed to publish message %s' % str(e)))
try: try:
self.reconnect() self.reconnect()
if publisher:
publisher.reconnect(self.channel)
except self.connection.connection_errors, e: except self.connection.connection_errors, e:
pass pass