From 8bdd06374ef29e3cdbdea9c304d74b3ff04bc745 Mon Sep 17 00:00:00 2001 From: "jingshun.tq" <35712518+Teingi@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:42:57 +0800 Subject: [PATCH] 2.3.0 fix analyze_log offline (#365) (#366) * clog update * build * update * update * update * update rca clog_disk_full_scene * del SsherClient SafeStdio super init func * update lock_conflict_scene * update clog_disk_full_scene * fix analyze_log offline * fix analyze_log offline Co-authored-by: wayyoungboy <35394786+wayyoungboy@users.noreply.github.com> --- handler/analyzer/analyze_log.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/handler/analyzer/analyze_log.py b/handler/analyzer/analyze_log.py index 434211e6..d018f36f 100644 --- a/handler/analyzer/analyze_log.py +++ b/handler/analyzer/analyze_log.py @@ -31,6 +31,7 @@ from common.tool import DirectoryUtil from common.tool import FileUtil from common.tool import TimeUtils +import common.ssh_client.local_client as ssh_client_local_client class AnalyzeLogHandler(BaseShellHandler): @@ -279,11 +280,13 @@ def __pharse_offline_log_file(self, ssh_client, log_name, local_store_dir): :param ssh_helper, log_name :return: """ + + ssh_client = ssh_client_local_client.LocalClient(context=self.context, node={"ssh_type": "local"}) local_store_path = "{0}/{1}".format(local_store_dir, str(log_name).strip(".").replace("/", "_")) if self.grep_args is not None: grep_cmd = "grep -e '{grep_args}' {log_name} >> {local_store_path} ".format(grep_args=self.grep_args, log_name=log_name, local_store_path=local_store_path) self.stdio.verbose("grep files, run cmd = [{0}]".format(grep_cmd)) - ssh_client.exec_cmd(ssh_client, grep_cmd) + ssh_client.exec_cmd(grep_cmd) else: download_file(ssh_client, log_name, local_store_path, self.stdio)