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

use inventory_id to get advisory_lock

Browse Source
This commit is contained in:
Jim Ladd
2020-11-12 16:07:01 -08:00
committed by Alan Rominger
parent 38638b4a6b
commit 5ad60a3ed4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/main/management/commands/inventory_import.py
View File

@@ -904,15 +904,15 @@ class Command(BaseCommand):
self.inventory_update.save(update_fields=['org_host_limit_error']) self.inventory_update.save(update_fields=['org_host_limit_error'])
def handle(self, *args, **options): def handle(self, *args, **options):
with advisory_lock('inventory_{}_import'.format(self.inventory.id)): # Load inventory and related objects from database.
# Load inventory and related objects from database. inventory_name = options.get('inventory_name', None)
inventory_name = options.get('inventory_name', None) inventory_id = options.get('inventory_id', None)
inventory_id = options.get('inventory_id', None) if inventory_name and inventory_id:
if inventory_name and inventory_id: raise CommandError('--inventory-name and --inventory-id are mutually exclusive')
raise CommandError('--inventory-name and --inventory-id are mutually exclusive') elif not inventory_name and not inventory_id:
elif not inventory_name and not inventory_id: raise CommandError('--inventory-name or --inventory-id is required')
raise CommandError('--inventory-name or --inventory-id is required')
with advisory_lock('inventory_{}_import'.format(inventory_id)):
# Obtain rest of the options needed to run update # Obtain rest of the options needed to run update
raw_source = options.get('source', None) raw_source = options.get('source', None)
if not raw_source: if not raw_source: