ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #13102 from Yannig/devel_cache_enhancement

Browse source 
New method template_no_cache for template object.
This commit is contained in:
James Cammarata 2015-11-10 02:23:42 -05:00
commit d8fb5efa90
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/executor/task_executor.py
View file

@ -256,7 +256,7 @@ class TaskExecutor:
variables['item'] = item variables['item'] = item
if self._task.evaluate_conditional(templar, variables): if self._task.evaluate_conditional(templar, variables):
if templar._contains_vars(name): if templar._contains_vars(name):
new_item = templar.template(name) new_item = templar.template(name, cache=False)
final_items.append(new_item) final_items.append(new_item)
else: else:
final_items.append(item) final_items.append(item)

15
lib/ansible/template/__init__.py
View file

@ -268,7 +268,7 @@ class Templar:
self._available_variables = variables self._available_variables = variables
self._cached_result = {} self._cached_result = {}
def template(self, variable, convert_bare=False, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None, convert_data=True, static_vars = ['']): def template(self, variable, convert_bare=False, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None, convert_data=True, static_vars = [''], cache = True):
''' '''
Templates (possibly recursively) any given data as input. If convert_bare is Templates (possibly recursively) any given data as input. If convert_bare is
set to True, the given data will be wrapped as a jinja2 variable ('{{foo}}') set to True, the given data will be wrapped as a jinja2 variable ('{{foo}}')
@ -299,7 +299,6 @@ class Templar:
# Check to see if the string we are trying to render is just referencing a single # Check to see if the string we are trying to render is just referencing a single
# var. In this case we don't want to accidentally change the type of the variable # var. In this case we don't want to accidentally change the type of the variable
# to a string by using the jinja template renderer. We just want to pass it. # to a string by using the jinja template renderer. We just want to pass it.
var_name = None
only_one = self.SINGLE_VAR.match(variable) only_one = self.SINGLE_VAR.match(variable)
if only_one: if only_one:
var_name = only_one.group(1) var_name = only_one.group(1)
@ -311,10 +310,12 @@ class Templar:
return C.DEFAULT_NULL_REPRESENTATION return C.DEFAULT_NULL_REPRESENTATION
# Using a cache in order to prevent template calls with already templated variables # Using a cache in order to prevent template calls with already templated variables
variable_hash = sha1(text_type(variable).encode('utf-8')) sha1_hash = None
options_hash = sha1((text_type(preserve_trailing_newlines) + text_type(escape_backslashes) + text_type(fail_on_undefined) + text_type(overrides)).encode('utf-8')) if cache:
sha1_hash = variable_hash.hexdigest() + options_hash.hexdigest() variable_hash = sha1(text_type(variable).encode('utf-8'))
if var_name not in (None, 'item') and sha1_hash in self._cached_result: options_hash = sha1((text_type(preserve_trailing_newlines) + text_type(escape_backslashes) + text_type(fail_on_undefined) + text_type(overrides)).encode('utf-8'))
sha1_hash = variable_hash.hexdigest() + options_hash.hexdigest()
if cache and sha1_hash in self._cached_result:
result = self._cached_result[sha1_hash] result = self._cached_result[sha1_hash]
else: else:
result = self._do_template(variable, preserve_trailing_newlines=preserve_trailing_newlines, escape_backslashes=escape_backslashes, fail_on_undefined=fail_on_undefined, overrides=overrides) result = self._do_template(variable, preserve_trailing_newlines=preserve_trailing_newlines, escape_backslashes=escape_backslashes, fail_on_undefined=fail_on_undefined, overrides=overrides)
@ -332,7 +333,7 @@ class Templar:
# we only cache in the case where we have a single variable # we only cache in the case where we have a single variable
# name, to make sure we're not putting things which may otherwise # name, to make sure we're not putting things which may otherwise
# be dynamic in the cache (filters, lookups, etc.) # be dynamic in the cache (filters, lookups, etc.)
if var_name not in (None, 'item'): if cache:
self._cached_result[sha1_hash] = result self._cached_result[sha1_hash] = result
return result return result