Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.3.0 fix analyze_log offline #365

Merged
merged 14 commits into from
Jul 24, 2024
Merged

2.3.0 fix analyze_log offline #365

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d2852eb
clog update
wayyoungboy Jul 18, 2024
1c62bb0
build
wayyoungboy Jul 18, 2024
f756080
Merge remote-tracking branch 'refs/remotes/origin/master' into 2.3.0-…
wayyoungboy Jul 18, 2024
b4b841b
update
wayyoungboy Jul 19, 2024
1fe80f5
update
wayyoungboy Jul 19, 2024
b915ec7
update
wayyoungboy Jul 19, 2024
198d2d7
update rca clog_disk_full_scene
wayyoungboy Jul 22, 2024
7445f70
del SsherClient SafeStdio super init func
wayyoungboy Jul 22, 2024
7d6b470
update lock_conflict_scene
wayyoungboy Jul 22, 2024
373c7a6
update clog_disk_full_scene
wayyoungboy Jul 23, 2024
37d6353
Merge branch 'refs/heads/master' into 2.3.0-qulei_tmp
wayyoungboy Jul 23, 2024
4bf55c4
Merge branch 'refs/heads/master' into 2.3.0-qulei_tmp
wayyoungboy Jul 24, 2024
23ae53a
fix analyze_log offline
wayyoungboy Jul 24, 2024
04c9947
fix analyze_log offline
wayyoungboy Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion handler/analyzer/analyze_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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)

Expand Down
Loading