This commit is contained in:
Miroslav Stampar 2016-01-27 21:25:34 +01:00
parent ee0439cf11
commit 954b4ec32b

View File

@ -177,10 +177,10 @@ class Task(object):
def engine_kill(self): def engine_kill(self):
if self.process: if self.process:
self.process.kill() try:
return self.process.wait() self.process.kill()
else: except:
return None pass
def engine_get_id(self): def engine_get_id(self):
if self.process: if self.process:
@ -391,12 +391,11 @@ def task_flush(taskid):
""" """
Flush task spool (delete all tasks) Flush task spool (delete all tasks)
""" """
if is_admin(taskid):
DataStore.tasks = dict() for key in list(DataStore.tasks):
else: if is_admin(taskid) or DataStore.tasks[key].remote_addr == request.remote_addr:
for key in list(DataStore.tasks): DataStore.tasks[key].engine_kill()
if DataStore.tasks[key].remote_addr == request.remote_addr: del DataStore.tasks[key]
del DataStore.tasks[key]
logger.debug("[%s] Flushed task pool (%s)" % (taskid, "admin" if is_admin(taskid) else request.remote_addr)) logger.debug("[%s] Flushed task pool (%s)" % (taskid, "admin" if is_admin(taskid) else request.remote_addr))
return jsonize({"success": True}) return jsonize({"success": True})