From 78b83e525b475e2dda79c26ff56ab4accb8dd1fb Mon Sep 17 00:00:00 2001 From: jinsaihang Date: Mon, 14 Oct 2024 13:07:48 +0800 Subject: [PATCH] fix word error Signed-off-by: jinsaihang --- fix-word-error.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++ sysSentry.spec | 9 +++++++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 fix-word-error.patch diff --git a/fix-word-error.patch b/fix-word-error.patch new file mode 100644 index 0000000..1e7de89 --- /dev/null +++ b/fix-word-error.patch @@ -0,0 +1,53 @@ +From 5be0d121c6fde185d323dc4bcf3026e2c3ee8757 Mon Sep 17 00:00:00 2001 +From: jinsaihang +Date: Mon, 14 Oct 2024 11:30:58 +0800 +Subject: [PATCH] fix word error + +Signed-off-by: jinsaihang +--- + 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 + diff --git a/sysSentry.spec b/sysSentry.spec index 5005ef7..0aaf08f 100644 --- a/sysSentry.spec +++ b/sysSentry.spec @@ -4,7 +4,7 @@ Summary: System Inspection Framework Name: sysSentry Version: 1.0.2 -Release: 41 +Release: 42 License: Mulan PSL v2 Group: System Environment/Daemons Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -57,6 +57,7 @@ Patch44: add-root-cause-analysis.patch Patch45: update-collect-log.patch Patch46: modify-abnormal-stack-when-the-disk-field-is-not-con.patch Patch47: precise-alarm-query-time.patch +Patch48: fix-word-error.patch BuildRequires: cmake gcc-c++ BuildRequires: python3 python3-setuptools @@ -329,6 +330,12 @@ rm -rf %{buildroot} %attr(0550,root,root) %{python3_sitelib}/sentryCollector/__pycache__/collect_plugin* %changelog +* Mon Oct 14 2024 jinsaihang - 1.0.2-42 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix word error + * Mon Oct 14 2024 zhuofeng - 1.0.2-41 - Type:bugfix - CVE:NA -- Gitee