Commit 9b9e29a3 authored by blitzmann's avatar blitzmann

Implement worker thread as a daemon

parent e7eb5b6e
...@@ -59,7 +59,7 @@ class WorkerThread(threading.Thread): ...@@ -59,7 +59,7 @@ class WorkerThread(threading.Thread):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.dequeued = list() self.dequeued = list()
self.daemon = True
self.doLock = threading.Lock() self.doLock = threading.Lock()
self.queue = ImprovedQueue() self.queue = ImprovedQueue()
self.num = 0 self.num = 0
...@@ -101,24 +101,23 @@ class WorkerThread(threading.Thread): ...@@ -101,24 +101,23 @@ class WorkerThread(threading.Thread):
# Main thread loop starting the different tasks # Main thread loop starting the different tasks
def run(self): def run(self):
main_thread = _get_main_thread() # this blocks until something is available
while main_thread.is_alive(): item = self.queue.get()
# this blocks until something is available
item = self.queue.get() with self.doLock:
with self.doLock: # add to list so that in-progress tasks show up
# add to list so that in-progress tasks show up self.dequeued.append(item)
self.dequeued.append(item)
# once we hit our trigger, start cleaning up dead tasks
# once we hit our trigger, start cleaning up dead tasks if len(self.dequeued) > TASK_CLEANUP_TRIGGER:
if len(self.dequeued) > TASK_CLEANUP_TRIGGER: self.cleanup_tasks()
self.cleanup_tasks()
# sometimes tasks (like Upload) don't actually have work to do and are created as already finished
# sometimes tasks (like Upload) don't actually have work to do and are created as already finished if item.task.stat is STAT_WAITING:
if item.task.stat is STAT_WAITING: # CalibreTask.start() should wrap all exceptions in it's own error handling
# CalibreTask.start() should wrap all exceptions in it's own error handling item.task.start(self)
item.task.start(self)
self.queue.task_done()
self.queue.task_done()
class CalibreTask: class CalibreTask:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment