cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make sure cached data from file loads isn't impacted by modifications

Browse source 
Fixes #11893
This commit is contained in:
James Cammarata 2015-08-12 14:25:54 -04:00
parent 6bceee9a93
commit d9833f227f
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/parsing/__init__.py
View file

@ -19,6 +19,7 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import copy
import json import json
import os import os
@ -100,16 +101,17 @@ class DataLoader():
# if the file has already been read in and cached, we'll # if the file has already been read in and cached, we'll
# return those results to avoid more file/vault operations # return those results to avoid more file/vault operations
if file_name in self._FILE_CACHE: if file_name in self._FILE_CACHE:
return self._FILE_CACHE[file_name] parsed_data = self._FILE_CACHE[file_name]
else:
# read the file contents and load the data structure from them
(file_data, show_content) = self._get_file_contents(file_name)
parsed_data = self.load(data=file_data, file_name=file_name, show_content=show_content)
# read the file contents and load the data structure from them # cache the file contents for next time
(file_data, show_content) = self._get_file_contents(file_name) self._FILE_CACHE[file_name] = parsed_data
parsed_data = self.load(data=file_data, file_name=file_name, show_content=show_content)
# cache the file contents for next time # return a deep copy here, so the cache is not affected
self._FILE_CACHE[file_name] = parsed_data return copy.deepcopy(parsed_data)
return parsed_data
def path_exists(self, path): def path_exists(self, path):
path = self.path_dwim(path) path = self.path_dwim(path)