From 092b7b5becbd9ba1af39c6cd710974fd0c00c31a Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sun, 12 Apr 2015 18:21:29 -0400
Subject: [PATCH] Fix to allow pulsar to shutdown cleanly again.
---
pulsar/managers/queued.py | 1 +
pulsar/messaging/bind_amqp.py | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pulsar/managers/queued.py b/pulsar/managers/queued.py
index d8bf749c..5295af15 100644
--- a/pulsar/managers/queued.py
+++ b/pulsar/managers/queued.py
@@ -41,6 +41,7 @@ class QueueManager(Manager):
self.work_threads = []
for i in range(num_concurrent_jobs):
worker = threading.Thread(target=self.run_next)
+ worker.daemon = True
worker.start()
self.work_threads.append(worker)
diff --git a/pulsar/messaging/bind_amqp.py b/pulsar/messaging/bind_amqp.py
index 3403d9e9..3f489ebe 100644
--- a/pulsar/messaging/bind_amqp.py
+++ b/pulsar/messaging/bind_amqp.py
@@ -71,7 +71,9 @@ def __start_consumer(name, exchange, target):
exchange_url = mask_password_from_url(exchange.url)
thread_name = "consume-%s-%s" % (name, exchange_url)
thread = threading.Thread(name=thread_name, target=target)
- thread.daemon = False
+ # TODO: If the shutdown code is actually called make this
+ # not a daemon.
+ thread.daemon = True
thread.start()
return thread
--
GitLab