cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

now it really is oneline

Browse source
This commit is contained in:
Brian Coca 2015-07-26 23:14:07 -04:00
parent 5d1d9f1505
commit a56ff7ae54
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/plugins/callback/oneline.py
View file

@ -35,10 +35,12 @@ class CallbackModule(CallbackBase):
CALLBACK_NAME = 'oneline' CALLBACK_NAME = 'oneline'
def _command_generic_msg(self, hostname, result, caption): def _command_generic_msg(self, hostname, result, caption):
stdout = result.get('stdout','').replace('\n', '\\n')
if 'stderr' in result and result['stderr']: if 'stderr' in result and result['stderr']:
return "%s | %s | rc=%s | (stdout) %s (stderr) %s" % (hostname, caption, result.get('rc',0), result.get('stdout',''), result.get('stderr','')) stderr = result.get('stderr','').replace('\n', '\\n')
return "%s | %s | rc=%s | (stdout) %s (stderr) %s" % (hostname, caption, result.get('rc',0), stdout, stderr)
else: else:
return "%s | %s | rc=%s | (stdout) %s" % (hostname, caption, result.get('rc',0), result.get('stdout','')) return "%s | %s | rc=%s | (stdout) %s" % (hostname, caption, result.get('rc',0), stdout)
def v2_runner_on_failed(self, result, ignore_errors=False): def v2_runner_on_failed(self, result, ignore_errors=False):
if 'exception' in result._result: if 'exception' in result._result: