External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 18:07:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

avoid nested on_commit use

Browse Source
This commit is contained in:
AlanCoding
2018-11-06 15:08:43 -05:00
committed by Marliana Lara
parent 0783d86c6c
commit 1bed5d4af2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/scheduler/task_manager.py
View File

@@ -152,7 +152,7 @@ class TaskManager():
if not can_start: if not can_start:
job.status = 'failed' job.status = 'failed'
job.save(update_fields=['status', 'job_explanation']) job.save(update_fields=['status', 'job_explanation'])
connection.on_commit(lambda: job.websocket_emit_status('failed')) job.websocket_emit_status('failed')
# TODO: should we emit a status on the socket here similar to tasks.py awx_periodic_scheduler() ? # TODO: should we emit a status on the socket here similar to tasks.py awx_periodic_scheduler() ?
#emit_websocket_notification('/socket.io/jobs', '', dict(id=)) #emit_websocket_notification('/socket.io/jobs', '', dict(id=))
@@ -169,7 +169,7 @@ class TaskManager():
workflow_job.status = 'canceled' workflow_job.status = 'canceled'
workflow_job.start_args = '' # blank field to remove encrypted passwords workflow_job.start_args = '' # blank field to remove encrypted passwords
workflow_job.save(update_fields=['status', 'start_args']) workflow_job.save(update_fields=['status', 'start_args'])
connection.on_commit(lambda: workflow_job.websocket_emit_status(workflow_job.status)) workflow_job.websocket_emit_status(workflow_job.status)
else: else:
is_done, has_failed = dag.is_workflow_done() is_done, has_failed = dag.is_workflow_done()
if not is_done: if not is_done:
@@ -181,7 +181,7 @@ class TaskManager():
workflow_job.status = new_status workflow_job.status = new_status
workflow_job.start_args = '' # blank field to remove encrypted passwords workflow_job.start_args = '' # blank field to remove encrypted passwords
workflow_job.save(update_fields=['status', 'start_args']) workflow_job.save(update_fields=['status', 'start_args'])
connection.on_commit(lambda: workflow_job.websocket_emit_status(workflow_job.status)) workflow_job.websocket_emit_status(workflow_job.status)
return result return result
def get_dependent_jobs_for_inv_and_proj_update(self, job_obj): def get_dependent_jobs_for_inv_and_proj_update(self, job_obj):
@@ -247,7 +247,6 @@ class TaskManager():
self.consume_capacity(task, rampart_group.name) self.consume_capacity(task, rampart_group.name)
def post_commit(): def post_commit():
task.websocket_emit_status(task.status)
if task.status != 'failed' and type(task) is not WorkflowJob: if task.status != 'failed' and type(task) is not WorkflowJob:
task_cls = task._get_task_class() task_cls = task._get_task_class()
task_cls.apply_async( task_cls.apply_async(
@@ -266,6 +265,7 @@ class TaskManager():
}], }],
) )
task.websocket_emit_status(task.status) # adds to on_commit
connection.on_commit(post_commit) connection.on_commit(post_commit)
def process_running_tasks(self, running_tasks): def process_running_tasks(self, running_tasks):