git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-22 17:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed the task status logic

Browse Source
This commit is contained in:
Marvin Zhang
2019-03-16 21:28:09 +08:00
parent c342ca715f
commit 826fe50f1e
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crawlab/routes/nodes.py
View File

@@ -65,11 +65,6 @@ class NodeApi(BaseApi):
spider_id = item['spider_id']
spider = db_manager.get('spiders', id=str(spider_id))
item['spider_name'] = spider['name']
_task = db_manager.get('tasks_celery', id=item['_id'])
if _task:
item['status'] = _task['status']
else:
item['status'] = TaskStatus.UNAVAILABLE
return {
'status': 'ok',
'items': jsonify(items)

9
crawlab/routes/tasks.py
View File

@@ -31,13 +31,8 @@ class TaskApi(BaseApi):
elif id is not None:
task = db_manager.get('tasks', id=id)
_task = db_manager.get('tasks_celery', id=task['_id'])
_spider = db_manager.get('spiders', id=str(task['spider_id']))
if _task:
if not task.get('status'):
task['status'] = _task['status']
task['result'] = _task['result']
task['spider_name'] = _spider['name']
spider = db_manager.get('spiders', id=str(task['spider_id']))
task['spider_name'] = spider['name']
try:
with open(task['log_file_path']) as f:
task['log'] = f.read()