github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 修改命令错误输出

pull/2145/head
ibuler 2018-12-12 10:41:28 +08:00
parent daadcedc21
commit 2fedeb9834
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/ops/ansible/callback.py
View File

@ -178,7 +178,13 @@ class CommandResultCallback(AdHocResultCallback):
def v2_runner_on_failed(self, result, ignore_errors=False): def v2_runner_on_failed(self, result, ignore_errors=False):
self.results_summary['success'] = False self.results_summary['success'] = False
self.gather_result("failed", result) self.gather_result("failed", result)
msg = result._result.get("msg") or result._result.get("module_stdout") msg = result._result.get("msg", '')
stderr = result._result.get("stderr")
if stderr:
msg += '\n' + stderr
module_stdout = result._result.get("module_stdout")
if module_stdout:
msg += '\n' + module_stdout
if not msg: if not msg:
msg = json.dumps(result._result, indent=4) msg = json.dumps(result._result, indent=4)
self._display.display("%s | FAILED! => \n%s" % ( self._display.display("%s | FAILED! => \n%s" % (