External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked"

Browse Source 
This reverts commit 9ba2122f4f85eecaeb6fa53ac92ea2811b05e83f, reversing
changes made to c3a5f2c96fd85dd1405a8f5c875ffc988dee16a4.
This commit is contained in:
Chris Meyers
2017-02-27 09:38:45 -05:00
parent ebd4064b82
commit dd513621f0
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/scheduler/__init__.py
View File

@@ -60,7 +60,8 @@ class TaskManager():
'''
Tasks that are running and SHOULD have a celery task.
'''
def get_running_tasks(self, status_list=('running',)):
def get_running_tasks(self):
status_list = ('running',)
jobs = JobDict.filter_partial(status=status_list)
inventory_updates = InventoryUpdateDict.filter_partial(status=status_list)
@@ -215,15 +216,15 @@ class TaskManager():
else:
if type(job_obj) is WorkflowJob:
job_obj.status = 'running'
else:
celery_task_id = job_obj.start_celery_task(opts, error_callback=error_handler, success_callback=success_handler)
job_obj.celery_task_id = celery_task_id
job_obj.save()
self.consume_capacity(task)
job_obj.save()
def post_commit():
job_obj.websocket_emit_status(job_obj.status)
if job_obj.status != 'failed':
job_obj.start_celery_task(opts, error_callback=error_handler, success_callback=success_handler)
connection.on_commit(post_commit)