External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix up more status emissions

Browse Source
This commit is contained in:
Matthew Jones
2014-04-21 15:02:12 -04:00
parent c0f821cdbf
commit 1d52f7cc9d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -335,7 +335,7 @@ class BaseTask(Task):
''' '''
Run the job/task and capture its output. Run the job/task and capture its output.
''' '''
emit_websocket_notification('/socket.io/jobs', 'status_changed', dict(unified_job_id=pk)) emit_websocket_notification('/socket.io/jobs', 'status_changed', dict(unified_job_id=pk, status='running'))
instance = self.update_model(pk, status='running', celery_task_id=self.request.id) instance = self.update_model(pk, status='running', celery_task_id=self.request.id)
status, tb = 'error', '' status, tb = 'error', ''
output_replacements = [] output_replacements = []
@@ -384,7 +384,7 @@ class BaseTask(Task):
instance = self.update_model(pk, status=status, result_traceback=tb, instance = self.update_model(pk, status=status, result_traceback=tb,
output_replacements=output_replacements) output_replacements=output_replacements)
self.post_run_hook(instance, **kwargs) self.post_run_hook(instance, **kwargs)
emit_websocket_notification('/socket.io/jobs', 'status_changed', dict(unified_job_id=pk)) emit_websocket_notification('/socket.io/jobs', 'status_changed', dict(unified_job_id=pk, status=status))
if status != 'successful' and not hasattr(settings, 'CELERY_UNIT_TEST'): if status != 'successful' and not hasattr(settings, 'CELERY_UNIT_TEST'):
# Raising an exception will mark the job as 'failed' in celery # Raising an exception will mark the job as 'failed' in celery
# and will stop a task chain from continuing to execute # and will stop a task chain from continuing to execute