Merge pull request #198 from chrisroberts/enhancement/no-wedgies

josegonzalez · josegonzalez · commit 7bbe07b41fb0 · 2013-10-17T17:44:36.000-07:00
Make consumer check threaded to prevent wedge state
diff --git a/beaver/worker/tail_manager.py b/beaver/worker/tail_manager.py
@@ -47,11 +47,18 @@ def watch(self, paths=[]):
             if tail.active:
                 self._tails[tail.fid()] = tail
 
+    def create_queue_consumer_if_required(self, interval=5.0):
+        if not (self._proc and self._proc.is_alive()):
+            self._proc = self._create_queue_consumer()
+        timer = threading.Timer(interval, self.create_queue_consumer_if_required)
+        timer.start()
+
     def run(self, interval=0.1,):
+
+        self.create_queue_consumer_if_required()
+
         while self._active:
             for fid in self._tails.keys():
-                if not (self._proc and self._proc.is_alive()):
-                    self._proc = self._create_queue_consumer()
 
                 self.update_files()
 
diff --git a/beaver/worker/worker.py b/beaver/worker/worker.py
@@ -8,6 +8,7 @@
 import sqlite3
 import stat
 import time
+import threading
 
 from beaver.utils import IS_GZIPPED_FILE, REOPEN_FILES, eglob, multiline_merge
 from beaver.unicode_dammit import ENCODINGS
@@ -82,14 +83,20 @@ def listdir(self):
         else:
             return []
 
+    def create_queue_consumer_if_required(self, interval=5.0):
+        if not (self._proc and self._proc.is_alive()):
+            self._proc = self._create_queue_consumer()
+        timer = threading.Timer(interval, self.create_queue_consumer_if_required)
+        timer.start()
+
     def loop(self, interval=0.1, async=False):
         """Start the loop.
         If async is True make one loop then return.
         """
+        self.create_queue_consumer_if_required()
+
         while True:
             t = time.time()
-            if not (self._proc and self._proc.is_alive()):
-                self._proc = self._create_queue_consumer()
 
             if int(time.time()) - self._update_time > self._beaver_config.get('discover_interval'):
                 self.update_files()
