External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 13:10:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

property filter no_log for item event loops

Browse Source 
see: #5691
This commit is contained in:
Ryan Petrello
2017-03-22 11:14:48 -04:00
parent 5907b3dcad
commit f9b5b9aa91
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/lib/tests/test_display_callback.py
View File

@@ -60,7 +60,7 @@ def executor(tmpdir_factory, request):
cli = PlaybookCLI(['', 'playbook.yml']) cli = PlaybookCLI(['', 'playbook.yml'])
cli.parse() cli.parse()
options = cli.parser.parse_args([])[0] options = cli.parser.parse_args(['-v'])[0]
loader = DataLoader() loader = DataLoader()
variable_manager = VariableManager() variable_manager = VariableManager()
inventory = Inventory(loader=loader, variable_manager=variable_manager, inventory = Inventory(loader=loader, variable_manager=variable_manager,

10
awx/lib/tower_display_callback/module.py
View File

@@ -30,6 +30,8 @@ from ansible.plugins.callback.default import CallbackModule as DefaultCallbackMo
from .events import event_context from .events import event_context
from .minimal import CallbackModule as MinimalCallbackModule from .minimal import CallbackModule as MinimalCallbackModule
CENSORED = "the output has been hidden due to the fact that 'no_log: true' was specified for this result" # noqa
class BaseCallbackModule(CallbackBase): class BaseCallbackModule(CallbackBase):
''' '''
@@ -69,8 +71,12 @@ class BaseCallbackModule(CallbackBase):
else: else:
task = None task = None
if event_data.get('res') and event_data['res'].get('_ansible_no_log', False): if event_data.get('res'):
event_data['res'] = {'censored': "the output has been hidden due to the fact that 'no_log: true' was specified for this result"} # noqa if event_data['res'].get('_ansible_no_log', False):
event_data['res'] = {'censored': CENSORED}
for i, item in enumerate(event_data['res'].get('results', [])):
if event_data['res']['results'][i].get('_ansible_no_log', False):
event_data['res']['results'][i] = {'censored': CENSORED}
with event_context.display_lock: with event_context.display_lock:
try: try: