From 323a08ab699ee9f38f042a1fdf6b24a782c09137 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Sun, 9 Nov 2014 16:19:23 +0000
Subject: [PATCH] Redis: Ignore errors when unregistering connection fd at
 disconnection.

---
 kombu/transport/redis.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
index 810dd1b9..93a98d2c 100644
--- a/kombu/transport/redis.py
+++ b/kombu/transport/redis.py
@@ -255,9 +255,10 @@ class MultiChannelPoller(object):
         self._channels.discard(channel)
 
     def _on_connection_disconnect(self, connection):
-        sock = getattr(connection, '_sock', None)
-        if sock is not None:
-            self.poller.unregister(sock)
+        try:
+            self.poller.unregister(connection._sock)
+        except (AttributeError, TypeError):
+            pass
 
     def _register(self, channel, client, type):
         if (channel, client, type) in self._chan_to_sock: