Merge pull request #737 from hulu/master

add daemon option to PubSubWorker so ctrl-c will work

Author: andymccurdy

redis/client.py

@@ -2362,22 +2362,23 @@ def handle_message(self, response, ignore_subscribe_messages=False):
 
         return message
 
-    def run_in_thread(self, sleep_time=0):
+    def run_in_thread(self, sleep_time=0, daemon=False):
         for channel, handler in iteritems(self.channels):
             if handler is None:
                 raise PubSubError("Channel: '%s' has no handler registered")
         for pattern, handler in iteritems(self.patterns):
             if handler is None:
                 raise PubSubError("Pattern: '%s' has no handler registered")
 
-        thread = PubSubWorkerThread(self, sleep_time)
+        thread = PubSubWorkerThread(self, sleep_time, daemon=daemon)
         thread.start()
         return thread
 
 
 class PubSubWorkerThread(threading.Thread):
-    def __init__(self, pubsub, sleep_time):
+    def __init__(self, pubsub, sleep_time, daemon=False):
         super(PubSubWorkerThread, self).__init__()
+        self.daemon = daemon
         self.pubsub = pubsub
         self.sleep_time = sleep_time
         self._running = False