diff --git a/script/gspylib/threads/SshTool.py b/script/gspylib/threads/SshTool.py index 54ada8cd9b1b82825ec06f41c24000376faa9ef9..d5f451d7dcfc018e96ac85236a5a797bb78fb926 100644 --- a/script/gspylib/threads/SshTool.py +++ b/script/gspylib/threads/SshTool.py @@ -730,7 +730,10 @@ class SshTool(): hostname = hostList if status == 0: resultMap[hostname[0]] = DefaultValue.SUCCESS - outputCollect = "[%s] %s:\n%s" % ("SUCCESS", hostname[0], + if "gs_om -t status --detail" in cmd: + outputCollect = "[%s] %s:\n%s" % ("SUCCESS", hostname[0], output) + else: + outputCollect = "[%s] %s:\n%s" % ("SUCCESS", hostname[0], SensitiveMask.mask_pwd(output)) if not os.path.exists(self.__outputPath): diff --git a/script/impl/om/OmImpl.py b/script/impl/om/OmImpl.py index 7b7ef7cb152c661351a6d63133d86b4b8b655152..b8a9c5a55897470ef6b13e5fd8e1250f8075740d 100644 --- a/script/impl/om/OmImpl.py +++ b/script/impl/om/OmImpl.py @@ -181,12 +181,15 @@ class OmImpl: node_head = temp_lines[-3].split("|")[0] node_split = "-" * len(node_head) node_info = [info.strip() for info in temp_lines[-1].split("|")] - self.logger.log("\n".join(temp_lines[:-3] + [node_head] + [node_split] + - node_info)) + result = "\n".join(temp_lines[:-3] + [node_head] + [node_split] + node_info) + print(result) + self.logger.debug(result) else: - self.logger.log(output) + print(output) + self.logger.debug(output) if node_status_line: - self.logger.log(node_status_line) + print(node_status_line) + self.logger.debug(node_status_line) else: if node_status_line: FileUtil.createFileInSafeMode(self.context.g_opts.outFile)