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

Merge pull request #589 from ansible/fix-project_update_cascade_fast

Browse Source 
correctly cascade job cancel
This commit is contained in:
Chris Meyers
2017-11-27 13:21:25 -05:00
committed by GitHub
parent 4ea27e0d1b 6c89935521
commit 5a2ecd25e7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/tasks.py
View File

@@ -1279,10 +1279,12 @@ class RunJob(BaseTask):
task_instance.run(local_project_sync.id) task_instance.run(local_project_sync.id)
job = self.update_model(job.pk, scm_revision=job.project.scm_revision) job = self.update_model(job.pk, scm_revision=job.project.scm_revision)
except Exception: except Exception:
job = self.update_model(job.pk, status='failed', local_project_sync.refresh_from_db()
job_explanation=('Previous Task Failed: {"job_type": "%s", "job_name": "%s", "job_id": "%s"}' % if local_project_sync.status != 'canceled':
('project_update', local_project_sync.name, local_project_sync.id))) job = self.update_model(job.pk, status='failed',
raise job_explanation=('Previous Task Failed: {"job_type": "%s", "job_name": "%s", "job_id": "%s"}' %
('project_update', local_project_sync.name, local_project_sync.id)))
raise
if job.use_fact_cache and not kwargs.get('isolated'): if job.use_fact_cache and not kwargs.get('isolated'):
job.start_job_fact_cache() job.start_job_fact_cache()