From 826fe50f1e4afe170aaddf47e49cd8a1275b11bf Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 16 Mar 2019 21:28:09 +0800 Subject: [PATCH] changed the task status logic --- crawlab/routes/nodes.py | 5 ----- crawlab/routes/tasks.py | 9 ++------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/crawlab/routes/nodes.py b/crawlab/routes/nodes.py index d0daa347..7dbe50b5 100644 --- a/crawlab/routes/nodes.py +++ b/crawlab/routes/nodes.py @@ -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) diff --git a/crawlab/routes/tasks.py b/crawlab/routes/tasks.py index 1b13f87e..2a1449c4 100644 --- a/crawlab/routes/tasks.py +++ b/crawlab/routes/tasks.py @@ -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()