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

Merge branch 'devel' into workflow-visualizer-search

Browse Source
This commit is contained in:
Daniel Sami
2018-10-19 10:33:51 -04:00
committed by GitHub
parent 0bbf1d7014 41671b5868
commit eec05eac3c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -566,7 +566,7 @@ def update_host_smart_inventory_memberships():
@task() @task()
def delete_inventory(inventory_id, user_id): def delete_inventory(inventory_id, user_id, retries=5):
# Delete inventory as user # Delete inventory as user
if user_id is None: if user_id is None:
user = None user = None
@@ -591,7 +591,9 @@ def delete_inventory(inventory_id, user_id):
return return
except DatabaseError: except DatabaseError:
logger.exception('Database error deleting inventory {}, but will retry.'.format(inventory_id)) logger.exception('Database error deleting inventory {}, but will retry.'.format(inventory_id))
# TODO: self.retry(countdown=10) if retries > 0:
time.sleep(10)
delete_inventory(inventory_id, user_id, retries=retries - 1)
def with_path_cleanup(f): def with_path_cleanup(f):