ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 03:41:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

adjust script caching to processed data

Browse source 
also added filename to loading for better errors
This commit is contained in:
Brian Coca 2017-06-20 13:42:40 -04:00 • committed by Brian Coca
parent 0296c2285b
commit 0bbf0e8d19
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/plugins/inventory/script.py
View file

@ -84,9 +84,7 @@ class InventoryModule(BaseInventoryPlugin):
try: try:
cache_key = self.get_cache_prefix(path) cache_key = self.get_cache_prefix(path)
if cache and cache_key in inventory.cache: if not cache or cache_key not in inventory.cache:
data = inventory.cache[cache_key]
else:
try: try:
sp = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) sp = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
except OSError as e: except OSError as e:
@ -107,14 +105,12 @@ class InventoryModule(BaseInventoryPlugin):
except Exception as e: except Exception as e:
raise AnsibleError("Inventory {0} contained characters that cannot be interpreted as UTF-8: {1}".format(path, to_native(e))) raise AnsibleError("Inventory {0} contained characters that cannot be interpreted as UTF-8: {1}".format(path, to_native(e)))
if cache:
inventory.cache[cache_key] = data
try: try:
processed = self.loader.load(data) inventory.cache[cache_key] = self.loader.load(data, file_name=path)
except Exception as e: except Exception as e:
raise AnsibleError("failed to parse executable inventory script results from {0}: {1}\n{2}".format(path, to_native(e), err)) raise AnsibleError("failed to parse executable inventory script results from {0}: {1}\n{2}".format(path, to_native(e), err))
processed = inventory.cache[cache_key]
if not isinstance(processed, Mapping): if not isinstance(processed, Mapping):
raise AnsibleError("failed to parse executable inventory script results from {0}: needs to be a json dict\n{1}".format(path, err)) raise AnsibleError("failed to parse executable inventory script results from {0}: needs to be a json dict\n{1}".format(path, err))
@ -189,6 +185,6 @@ class InventoryModule(BaseInventoryPlugin):
if out.strip() == '': if out.strip() == '':
return {} return {}
try: try:
return json_dict_bytes_to_unicode(self.loader.load(out)) return json_dict_bytes_to_unicode(self.loader.load(out, file_name=path))
except ValueError: except ValueError:
raise AnsibleError("could not parse post variable response: %s, %s" % (cmd, out)) raise AnsibleError("could not parse post variable response: %s, %s" % (cmd, out))