From af83041c9f765294afb69635ef10fe34b18f2f3d Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Tue, 10 Jan 2017 23:48:29 +0100
Subject: [PATCH] huntin' and loggin'
---
coolamqp/clustering/cluster.py | 2 +-
coolamqp/uplink/listener/epoll_listener.py | 2 +-
coolamqp/uplink/listener/thread.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/coolamqp/clustering/cluster.py b/coolamqp/clustering/cluster.py
index 63cc8ff..df63401 100644
--- a/coolamqp/clustering/cluster.py
+++ b/coolamqp/clustering/cluster.py
@@ -147,7 +147,7 @@ class Cluster(object):
"""
logger.info('Commencing shutdown')
- self.snr.shutdown()
+# self.snr.shutdown()
self.listener.terminate()
if wait:
self.listener.join()
diff --git a/coolamqp/uplink/listener/epoll_listener.py b/coolamqp/uplink/listener/epoll_listener.py
index b5d3e1c..fa67e0b 100644
--- a/coolamqp/uplink/listener/epoll_listener.py
+++ b/coolamqp/uplink/listener/epoll_listener.py
@@ -113,7 +113,7 @@ class EpollListener(object):
This object is unusable after this call.
"""
self.time_events = []
- for sock in six.itervalues(self.fd_to_sock):
+ for sock in list(six.itervalues(self.fd_to_sock)):
sock.on_fail()
sock.close()
diff --git a/coolamqp/uplink/listener/thread.py b/coolamqp/uplink/listener/thread.py
index 40abd24..6e5d2dc 100644
--- a/coolamqp/uplink/listener/thread.py
+++ b/coolamqp/uplink/listener/thread.py
@@ -14,7 +14,7 @@ class ListenerThread(threading.Thread):
"""
def __init__(self):
- threading.Thread.__init__(self)
+ threading.Thread.__init__(self, name='coolamqp/ListenerThread')
self.daemon = True
self.terminating = False
self.listener = EpollListener()
--
GitLab