now that invocation is only async again, no need to sanitize

This commit is contained in:
Brian Coca 2015-07-15 10:40:37 -04:00
parent 2d870b7112
commit b76cb8f655
3 changed files with 3 additions and 20 deletions

View file

@ -235,4 +235,3 @@ DEFAULT_SUBSET = None
DEFAULT_SU_PASS = None DEFAULT_SU_PASS = None
VAULT_VERSION_MIN = 1.0 VAULT_VERSION_MIN = 1.0
VAULT_VERSION_MAX = 1.0 VAULT_VERSION_MAX = 1.0
RESULT_SANITIZE = frozenset(['warnings'])

View file

@ -33,7 +33,6 @@ try:
except ImportError: except ImportError:
HAS_ATFORK=False HAS_ATFORK=False
from ansible import constants as C
from ansible.playbook.handler import Handler from ansible.playbook.handler import Handler
from ansible.playbook.task import Task from ansible.playbook.task import Task
@ -108,10 +107,7 @@ class ResultProcess(multiprocessing.Process):
# if this task is registering a result, do it now # if this task is registering a result, do it now
if result._task.register: if result._task.register:
res = {} self._send_result(('register_host_var', result._host, result._task.register, result._result))
for k in set(result._result.keys()).difference(C.RESULT_SANITIZE):
res[k] = result._result[k]
self._send_result(('register_host_var', result._host, result._task.register, res))
# send callbacks, execute other options based on the result status # send callbacks, execute other options based on the result status
# FIXME: this should all be cleaned up and probably moved to a sub-function. # FIXME: this should all be cleaned up and probably moved to a sub-function.

View file

@ -21,8 +21,6 @@ __metaclass__ = type
import json import json
from ansible import constants as C
__all__ = ["CallbackBase"] __all__ = ["CallbackBase"]
@ -45,18 +43,8 @@ class CallbackBase:
version = getattr(self, 'CALLBACK_VERSION', 'unknwon') version = getattr(self, 'CALLBACK_VERSION', 'unknwon')
self._display.vvvv('Loaded callback %s of type %s, v%s' % (name, ctype, version)) self._display.vvvv('Loaded callback %s of type %s, v%s' % (name, ctype, version))
def _dump_results(self, result, sanitize=True, indent=4, sort_keys=True): def _dump_results(self, result, indent=4, sort_keys=True):
if sanitize: return json.dumps(result, indent=indent, ensure_ascii=False, sort_keys=sort_keys)
res = self._sanitize_result(result)
else:
res = result
return json.dumps(res, indent=indent, ensure_ascii=False, sort_keys=sort_keys)
def _sanitize_result(self, result):
res = {}
for k in set(result.keys()).difference(C.RESULT_SANITIZE):
res[k] = result[k]
return res
def set_connection_info(self, conn_info): def set_connection_info(self, conn_info):
pass pass