openstack
/
mistral
Code Issues Proposed changes

Trim yaql/jinja operation log 

Only keep the top level validation/evaluation log is enough for
debugging.

Change-Id: I22d18aeeafcf68aaa6f55da1c943b282f001ef82
This commit is contained in:
Lingxian Kong 2017-03-21 13:31:37 +13:00
parent 9d98e1ab9b
commit b563e5898f
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mistral/expressions/jinja_expression.py
View File

@ -46,11 +46,6 @@ class JinjaEvaluator(Evaluator):
@classmethod
def validate(cls, expression):
LOG.debug(
"Validating Jinja expression [expression='%s']",
expression
)
if not isinstance(expression, six.string_types):
raise exc.JinjaEvaluationException(
"Unsupported type '%s'." % type(expression)
@ -67,11 +62,6 @@ class JinjaEvaluator(Evaluator):
@classmethod
def evaluate(cls, expression, data_context):
LOG.debug(
"Evaluating Jinja expression [expression='%s', context=%s]"
% (expression, data_context)
)
opts = {'undefined_to_none': False}
ctx = expression_utils.get_jinja_context(data_context)
@ -89,8 +79,6 @@ class JinjaEvaluator(Evaluator):
", data=%s]" % (expression, str(e), data_context)
)
LOG.debug("Jinja expression result: %s" % result)
return result
@classmethod
@ -110,11 +98,6 @@ class InlineJinjaEvaluator(Evaluator):
@classmethod
def validate(cls, expression):
LOG.debug(
"Validating Jinja expression [expression='%s']",
expression
)
if not isinstance(expression, six.string_types):
raise exc.JinjaEvaluationException(
"Unsupported type '%s'." % type(expression)
@ -130,7 +113,7 @@ class InlineJinjaEvaluator(Evaluator):
@classmethod
def evaluate(cls, expression, data_context):
LOG.debug(
"Evaluating Jinja expression [expression='%s', context=%s]"
"Start to evaluate Jinja expression. [expression='%s', context=%s]"
% (expression, data_context)
)
@ -142,7 +125,10 @@ class InlineJinjaEvaluator(Evaluator):
ctx = expression_utils.get_jinja_context(data_context)
result = cls._env.from_string(expression).render(**ctx)
LOG.debug("Jinja expression result: %s" % result)
LOG.debug(
"Finished evaluation. [expression='%s', result: %s]" %
(expression, result)
)
return result

19
mistral/expressions/yaql_expression.py
View File

@ -35,8 +35,6 @@ INLINE_YAQL_REGEXP = '<%.*?%>'
class YAQLEvaluator(Evaluator):
@classmethod
def validate(cls, expression):
LOG.debug("Validating YAQL expression [expression='%s']", expression)
try:
YAQL_ENGINE(expression)
except (yaql_exc.YaqlException, KeyError, ValueError, TypeError) as e:
@ -46,11 +44,6 @@ class YAQLEvaluator(Evaluator):
def evaluate(cls, expression, data_context):
expression = expression.strip() if expression else expression
LOG.debug(
"Evaluating YAQL expression [expression='%s', context=%s]"
% (expression, data_context)
)
try:
result = YAQL_ENGINE(expression).evaluate(
context=expression_utils.get_yaql_context(data_context)
@ -61,8 +54,6 @@ class YAQLEvaluator(Evaluator):
", data=%s]" % (expression, str(e), data_context)
)
LOG.debug("YAQL expression result: %s" % result)
return result if not inspect.isgenerator(result) else list(result)
@classmethod
@ -79,9 +70,6 @@ class InlineYAQLEvaluator(YAQLEvaluator):
@classmethod
def validate(cls, expression):
LOG.debug(
"Validating inline YAQL expression [expression='%s']", expression)
if not isinstance(expression, six.string_types):
raise exc.YaqlEvaluationException(
"Unsupported type '%s'." % type(expression)
@ -96,7 +84,7 @@ class InlineYAQLEvaluator(YAQLEvaluator):
@classmethod
def evaluate(cls, expression, data_context):
LOG.debug(
"Evaluating inline YAQL expression [expression='%s', context=%s]"
"Start to evaluate YAQL expression. [expression='%s', context=%s]"
% (expression, data_context)
)
@ -113,7 +101,10 @@ class InlineYAQLEvaluator(YAQLEvaluator):
else:
result = result.replace(expr, str(evaluated))
LOG.debug("Inline YAQL expression result: %s" % result)
LOG.debug(
"Finished evaluation. [expression='%s', result: %s]" %
(expression, result)
)
return result