Merge "Gracefully handle consumer cancel notifications"
This commit is contained in:
commit
5594a57012
|
@ -514,6 +514,7 @@ class Connection(object):
|
||||||
self.connection = None
|
self.connection = None
|
||||||
self.connection = kombu.connection.BrokerConnection(**params)
|
self.connection = kombu.connection.BrokerConnection(**params)
|
||||||
self.connection_errors = self.connection.connection_errors
|
self.connection_errors = self.connection.connection_errors
|
||||||
|
self.channel_errors = self.connection.channel_errors
|
||||||
if self.memory_transport:
|
if self.memory_transport:
|
||||||
# Kludge to speed up tests.
|
# Kludge to speed up tests.
|
||||||
self.connection.transport.polling_interval = 0.0
|
self.connection.transport.polling_interval = 0.0
|
||||||
|
@ -591,6 +592,9 @@ class Connection(object):
|
||||||
except self.connection_errors as e:
|
except self.connection_errors as e:
|
||||||
if error_callback:
|
if error_callback:
|
||||||
error_callback(e)
|
error_callback(e)
|
||||||
|
except self.channel_errors as e:
|
||||||
|
if error_callback:
|
||||||
|
error_callback(e)
|
||||||
except (socket.timeout, IOError) as e:
|
except (socket.timeout, IOError) as e:
|
||||||
if error_callback:
|
if error_callback:
|
||||||
error_callback(e)
|
error_callback(e)
|
||||||
|
|
Loading…
Reference in New Issue