Skip to content

Make consumer check threaded to prevent wedge state #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josegonzalez merged 1 commit into from
Oct 18, 2013
Merged

Make consumer check threaded to prevent wedge state #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions beaver/worker/tail_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
11 changes: 9 additions & 2 deletions beaver/worker/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down