zuul
/
zuul
Code Issues Proposed changes

Improve display of simple error messages 

Fact gathering does not have a variable_manager yet, so we need to put
in an if condition for localhost fact gathering.

Additionally, simple errors, such as our local code is prohibited
message, wind up just being {'msg': 'Error Message', 'failed': True}. We
don't need to emit that as a json dict- we can TOTALLY emit that as, you
know, a string after ERROR. So it'll look like:

  2017-07-21 06:38:28.982788 | localhost | ERROR: Executing local code is prohibited

Story: 2001129
Task: 4838
Change-Id: Ie9f3bd917bf75f5a566a8a1a09ccf9f29786d82f
This commit is contained in:
Monty Taylor 2017-07-21 06:38:54 +09:00
parent 402f2ed2f2
commit e60af64c1b
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zuul/ansible/callback/zuul_stream.py
View File

@ -236,13 +236,17 @@ class CallbackModule(default.CallbackModule):
result_dict = dict(result._result)
localhost_names = ('localhost', '127.0.0.1')
is_localhost = False
task_host = result._host.get_name()
delegated_vars = result_dict.get('_ansible_delegated_vars', None)
if delegated_vars:
delegated_host = delegated_vars['ansible_host']
if delegated_host in localhost_names:
is_localhost = True
elif result._task._variable_manager is None:
# Handle fact gathering which doens't have a variable manager
if task_host == 'localhost':
is_localhost = True
else:
task_host = result._host.get_name()
task_hostvars = result._task._variable_manager._hostvars[task_host]
if task_hostvars.get('ansible_host', task_hostvars.get(
'ansible_inventory_host')) in localhost_names:
@ -470,11 +474,16 @@ class CallbackModule(default.CallbackModule):
def _log_message(self, result, msg=None, status="ok", result_dict=None):
hostname = self._get_hostname(result)
if result_dict:
result_dict = self._dump_result_dict(result_dict)
if result._task.no_log:
self._log("{host} | {msg}".format(
host=hostname,
msg="Output suppressed because no_log was given"))
return
if not msg and set(result_dict.keys()) == set(['msg', 'failed']):
msg = result_dict['msg']
result_dict = None
if msg:
msg_lines = msg.strip().split('\n')
if len(msg_lines) > 1:
@ -490,8 +499,7 @@ class CallbackModule(default.CallbackModule):
self._log("{host} | {status}".format(
host=hostname, status=status, msg=msg))
if result_dict:
result_string = json.dumps(self._dump_result_dict(result_dict),
indent=2, sort_keys=True)
result_string = json.dumps(result_dict, indent=2, sort_keys=True)
for line in result_string.split('\n'):
self._log("{host} | {line}".format(host=hostname, line=line))