!97 fix word error

From: @boluo56 
Reviewed-by: @hubin95 
Signed-off-by: @hubin95
This commit is contained in:
openeuler-ci-bot 2024-10-14 07:49:52 +00:00 committed by Gitee
commit cf1403e8ca
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 61 additions and 1 deletions

53
fix-word-error.patch Normal file
View File

@ -0,0 +1,53 @@
From 5be0d121c6fde185d323dc4bcf3026e2c3ee8757 Mon Sep 17 00:00:00 2001
From: jinsaihang <jinsaihang@h-partners.com>
Date: Mon, 14 Oct 2024 11:30:58 +0800
Subject: [PATCH] fix word error
Signed-off-by: jinsaihang <jinsaihang@h-partners.com>
---
sysSentry-1.0.2/src/python/syssentry/alarm.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/python/syssentry/alarm.py b/src/python/syssentry/alarm.py
index d012901..bff527c 100644
--- a/src/python/syssentry/alarm.py
+++ b/src/python/syssentry/alarm.py
@@ -49,7 +49,7 @@ MAX_ALARM_ID = (MIN_ALARM_ID + MAX_NUM_OF_ALARM_ID - 1)
def update_alarm_list(alarm_info: Xalarm):
alarm_id = xalarm_getid(alarm_info)
if alarm_id < MIN_ALARM_ID or alarm_id > MAX_ALARM_ID:
- logging.warnning(f"Invalid alarm_id {alarm_id}")
+ logging.warning(f"Invalid alarm_id {alarm_id}")
return
timestamp = xalarm_gettime(alarm_info)
if not timestamp:
@@ -97,14 +97,14 @@ def alarm_register():
task = TasksMap.tasks_dict[task_type][task_name]
alarm_id = task.alarm_id
if not check_alarm_id_if_number(alarm_id):
- logging.warnning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm")
+ logging.warning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm")
continue
if alarm_id < MIN_ALARM_ID or alarm_id > MAX_ALARM_ID:
- logging.warnning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm")
+ logging.warning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm")
continue
alarm_clear_time = task.alarm_clear_time
if not check_alarm_clear_time_if_positive_integer(alarm_clear_time):
- logging.warnning(f"Invalid alarm_clear_time {alarm_clear_time}: ignore {task_name} alarm")
+ logging.warning(f"Invalid alarm_clear_time {alarm_clear_time}: ignore {task_name} alarm")
continue
try:
alarm_clear_time = int(alarm_clear_time)
@@ -113,7 +113,7 @@ def alarm_register():
if alarm_clear_time > sys.maxsize:
raise ValueError("Exceeds maximum value for int")
except (ValueError, OverflowError, TypeError) as e:
- logging.warnning(f"Invalid alarm_clear_time {alarm_clear_time}: ignore {task_name} alarm")
+ logging.warning(f"Invalid alarm_clear_time {alarm_clear_time}: ignore {task_name} alarm")
continue
alarm_list_dict[alarm_id] = []
task_alarm_id_dict[task_name] = alarm_id
--
2.27.0

View File

@ -4,7 +4,7 @@
Summary: System Inspection Framework
Name: sysSentry
Version: 1.0.2
Release: 42
Release: 43
License: Mulan PSL v2
Group: System Environment/Daemons
Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz
@ -58,6 +58,7 @@ Patch45: update-collect-log.patch
Patch46: modify-abnormal-stack-when-the-disk-field-is-not-con.patch
Patch47: precise-alarm-query-time.patch
Patch48: ebpf-fix-dead-loop.patch
Patch49: fix-word-error.patch
BuildRequires: cmake gcc-c++
BuildRequires: python3 python3-setuptools
@ -330,6 +331,12 @@ rm -rf %{buildroot}
%attr(0550,root,root) %{python3_sitelib}/sentryCollector/__pycache__/collect_plugin*
%changelog
* Mon Oct 14 2024 jinsaihang <jinsaihang@h-partners.com> - 1.0.2-43
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:fix word error
* Mon Oct 14 2024 zhangnan <zhangnan134@huawei.com> - 1.0.2-42
- Type:bugfix
- CVE:NA