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

Use delay_update to set error message, according to merge note

Browse Source
This commit is contained in:
Alan Rominger
2022-08-17 11:45:40 -04:00
parent 1ea3c564df
commit 56739ac246
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/tasks/jobs.py
View File

@@ -610,15 +610,10 @@ class BaseTask(object):
self.instance = self.update_model(pk)
cancel_flag_value = getattr(self.instance, 'cancel_flag', False)
if (cancel_flag_value is False) and signal_callback():
# MERGE: prefer devel over this with runner_callback.delay_update(), and for elif case too
job_explanation = "Task was canceled due to receiving a shutdown signal."
self.instance.job_explanation = self.instance.job_explanation or job_explanation
extra_update_fields['job_explanation'] = self.instance.job_explanation
self.runner_callback.delay_update(skip_if_already_set=True, job_explanation="Task was canceled due to receiving a shutdown signal.")
status = 'failed'
elif cancel_flag_value is False:
job_explanation = "The running ansible process received a shutdown signal."
self.instance.job_explanation = self.instance.job_explanation or job_explanation
extra_update_fields['job_explanation'] = self.instance.job_explanation
self.runner_callback.delay_update(skip_if_already_set=True, job_explanation="The running ansible process received a shutdown signal.")
status = 'failed'
except ReceptorNodeNotFound as exc:
self.runner_callback.delay_update(job_explanation=str(exc))