shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Merge pull request #7195 from AlanCoding/exceptions_galore

Browse Source 
Additional exception handling for SCM inv updates
This commit is contained in:
Alan Rominger 2017-07-21 10:49:08 -04:00 committed by GitHub
commit eff5022635
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
awx/main/tasks.py
View File

@ -1436,18 +1436,24 @@ class RunProjectUpdate(BaseTask):
# Runs in the same Celery task as project update # Runs in the same Celery task as project update
task_instance.request.id = project_request_id task_instance.request.id = project_request_id
task_instance.run(local_inv_update.id) task_instance.run(local_inv_update.id)
except Exception as e: except Exception:
# A failed file update does not block other actions logger.exception('Encountered unhandled exception updating dependent SCM inventory sources.')
logger.error('Encountered error updating project dependent inventory: {}'.format(e))
# Stop rest of updates if project or inventory update was canceled try:
project_update.refresh_from_db() project_update.refresh_from_db()
except ProjectUpdate.DoesNotExist:
logger.warning('Project update deleted during updates of dependent SCM inventory sources.')
break
try:
local_inv_update.refresh_from_db() local_inv_update.refresh_from_db()
except InventoryUpdate.DoesNotExist:
logger.warning('Inventory update deleted during execution.')
continue
if project_update.cancel_flag or local_inv_update.cancel_flag: if project_update.cancel_flag or local_inv_update.cancel_flag:
if not project_update.cancel_flag: if not project_update.cancel_flag:
self.update_model(project_update.pk, cancel_flag=True, job_explanation=_( self.update_model(project_update.pk, cancel_flag=True, job_explanation=_(
'Dependent inventory update {} was canceled.'.format(local_inv_update.name))) 'Dependent inventory update {} was canceled.'.format(local_inv_update.name)))
break break # Stop rest of updates if project or inventory update was canceled
if local_inv_update.status == 'successful': if local_inv_update.status == 'successful':
inv_src.scm_last_revision = scm_revision inv_src.scm_last_revision = scm_revision
inv_src.save(update_fields=['scm_last_revision']) inv_src.save(update_fields=['scm_last_revision'])