add single task queue, hopefully helping with #207

This commit is contained in:
panni committed 2016-11-25 13:11:48 +01:00
1 parent 739ac633f6
commit 177f417f99
2 files changed
+17 -5

No files matched your search

+1 -1
View File
@@ -658,7 +658,7 @@ def RefreshItem(rating_key=None, came_from="/recent", item_title=None, force=Fal
@route(PREFIX + '/missing/refresh')
@debounce
def RefreshMissing(randomize=None):
Thread.CreateTimer(1.0, lambda: scheduler.run_task("SearchAllRecentlyAddedMissing"))
scheduler.dispatch_task("SearchAllRecentlyAddedMissing")
header = "Refresh of recently added items with missing subtitles triggered"
return fatality(header=header, replace_parent=True)
+16 -4
View File
@@ -27,7 +27,7 @@ class DefaultScheduler(object):
def init_storage(self):
if "tasks" not in Dict:
Dict["tasks"] = {}
Dict["tasks"] = {"queue": []}
Dict.Save()
def get_task_data(self, name):
@@ -114,8 +114,10 @@ class DefaultScheduler(object):
task.post_run(Dict["tasks"][name]["data"])
def dispatch_task(self, *args, **kwargs):
Thread.Create(self.run_task, True, *args, **kwargs)
Log.Debug("Dispatching single task: %s, %s", args, kwargs)
if "queue" not in Dict["tasks"]:
Dict["tasks"]["queue"] = []
Dict["tasks"]["queue"].append((args, kwargs))
def signal(self, name, *args, **kwargs):
for task_name, info in self.tasks.iteritems():
@@ -139,6 +141,16 @@ class DefaultScheduler(object):
if not self.running:
break
# single dispatch requested?
if Dict["tasks"]["queue"]:
# work queue off
queue = Dict["tasks"]["queue"][:]
Dict["tasks"]["queue"] = []
for args, kwargs in queue:
Log.Debug("Dispatching single task: %s, %s", args, kwargs)
Thread.Create(self.run_task, True, *args, **kwargs)
# scheduled tasks
for name, info in self.tasks.iteritems():
now = datetime.datetime.now()
task = info["task"]
@@ -156,7 +168,7 @@ class DefaultScheduler(object):
if not task.last_run or task.last_run + datetime.timedelta(**{frequency_key: frequency_num}) <= now:
self.run_task(name)
Thread.Sleep(10.0)
Thread.Sleep(5.0)
scheduler = DefaultScheduler()