External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-05 10:41:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Implement pluggable job explanation.

Browse Source
This commit is contained in:
Aaron Tan
2016-09-26 11:17:28 -04:00
parent 701c23171f
commit 2362f34d27
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -621,6 +621,7 @@ class BaseTask(Task):
status, rc, tb = 'error', None, '' status, rc, tb = 'error', None, ''
output_replacements = [] output_replacements = []
runtime_flags = {} runtime_flags = {}
extra_update_fields = {}
try: try:
self.pre_run_hook(instance, **kwargs) self.pre_run_hook(instance, **kwargs)
if instance.cancel_flag: if instance.cancel_flag:
@@ -643,7 +644,6 @@ class BaseTask(Task):
args = self.build_args(instance, **kwargs) args = self.build_args(instance, **kwargs)
safe_args = self.build_safe_args(instance, **kwargs) safe_args = self.build_safe_args(instance, **kwargs)
output_replacements = self.build_output_replacements(instance, **kwargs) output_replacements = self.build_output_replacements(instance, **kwargs)
job_explanation = ""
cwd = self.build_cwd(instance, **kwargs) cwd = self.build_cwd(instance, **kwargs)
env = self.build_env(instance, **kwargs) env = self.build_env(instance, **kwargs)
safe_env = self.build_safe_env(instance, **kwargs) safe_env = self.build_safe_env(instance, **kwargs)
@@ -685,12 +685,12 @@ class BaseTask(Task):
stdout_handle.flush() stdout_handle.flush()
stdout_handle.close() stdout_handle.close()
if runtime_flags.get('timed_out', False): if runtime_flags.get('timed_out', False):
job_explanation = "Job terminated due to timeout" extra_update_fields['job_explanation'] = "Job terminated due to timeout"
except Exception: except Exception:
pass pass
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,
job_explanation=job_explanation) **extra_update_fields)
self.post_run_hook(instance, **kwargs) self.post_run_hook(instance, **kwargs)
instance.websocket_emit_status(status) instance.websocket_emit_status(status)
if status != 'successful' and not hasattr(settings, 'CELERY_UNIT_TEST'): if status != 'successful' and not hasattr(settings, 'CELERY_UNIT_TEST'):