Merge "Sanitizer some sensitive logs information"
This commit is contained in:
commit
e1a3a3f077
|
@ -141,8 +141,9 @@ class TaskProcessingEndpoint(object):
|
||||||
result = task_executor.execute()
|
result = task_executor.execute()
|
||||||
return result
|
return result
|
||||||
finally:
|
finally:
|
||||||
|
s_result = token_sanitizer.TokenSanitizer().sanitize(result)
|
||||||
LOG.info('Finished processing task: {task_desc}'.format(
|
LOG.info('Finished processing task: {task_desc}'.format(
|
||||||
task_desc=jsonutils.dumps(result)))
|
task_desc=jsonutils.dumps(s_result)))
|
||||||
|
|
||||||
|
|
||||||
class StaticActionEndpoint(object):
|
class StaticActionEndpoint(object):
|
||||||
|
|
|
@ -23,6 +23,7 @@ from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
|
||||||
from murano.common import auth_utils
|
from murano.common import auth_utils
|
||||||
|
from murano.common.helpers import token_sanitizer
|
||||||
from murano.dsl import dsl
|
from murano.dsl import dsl
|
||||||
from murano.dsl import helpers
|
from murano.dsl import helpers
|
||||||
from murano.dsl import session_local_storage
|
from murano.dsl import session_local_storage
|
||||||
|
@ -212,7 +213,9 @@ class HeatStack(object):
|
||||||
|
|
||||||
def _push(self, object_store=None):
|
def _push(self, object_store=None):
|
||||||
template = copy.deepcopy(self._template)
|
template = copy.deepcopy(self._template)
|
||||||
LOG.debug('Pushing: {template}'.format(template=json.dumps(template)))
|
s_template = token_sanitizer.TokenSanitizer().sanitize(template)
|
||||||
|
LOG.debug('Pushing: {template}'.format(
|
||||||
|
template=json.dumps(s_template)))
|
||||||
object_store = object_store or helpers.get_object_store()
|
object_store = object_store or helpers.get_object_store()
|
||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue