From fddc071735776debc7061d222663ef6a56654137 Mon Sep 17 00:00:00 2001
From: Caohongtao <caohongtao_yewu@cmss.chinamobile.com>
Date: Tue, 15 Oct 2024 01:53:51 +0000
Subject: [PATCH] fix add-parameter-time_range-alarm_id-and-alarm_clear_ti
 patch log output

Signed-off-by: Caohongtao <caohongtao_yewu@cmss.chinamobile.com>
---
 ...me_range-alarm_id-and-alarm_clear_ti.patch | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/add-parameter-time_range-alarm_id-and-alarm_clear_ti.patch b/add-parameter-time_range-alarm_id-and-alarm_clear_ti.patch
index ee9e234..5c82c4b 100644
--- a/add-parameter-time_range-alarm_id-and-alarm_clear_ti.patch
+++ b/add-parameter-time_range-alarm_id-and-alarm_clear_ti.patch
@@ -16,49 +16,49 @@ index d5337d3..43c1065 100644
 --- a/src/python/syssentry/alarm.py
 +++ b/src/python/syssentry/alarm.py
 @@ -18,6 +18,7 @@ from datetime import datetime
- import time
- import logging
- import json
-+import sys
- 
- from xalarm.register_xalarm import xalarm_register,xalarm_getid,xalarm_getlevel,xalarm_gettype,xalarm_gettime,xalarm_getdesc
- from xalarm.xalarm_api import Xalarm
+ import time
+ import logging
+ import json
++import sys
+ 
+ from xalarm.register_xalarm import xalarm_register,xalarm_getid,xalarm_getlevel,xalarm_gettype,xalarm_gettime,xalarm_getdesc
+ from xalarm.xalarm_api import Xalarm
 @@ -41,9 +42,15 @@ id_base = 1001
- clientId = -1
- 
- MILLISECONDS_UNIT_SECONDS = 1000
-+MAX_NUM_OF_ALARM_ID = 128
-+MIN_ALARM_ID = 1001
-+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}")
-+        return
-     timestamp = xalarm_gettime(alarm_info)
-     if not timestamp:
-         logging.error("Retrieve timestamp failed")
+ clientId = -1
+ 
+ MILLISECONDS_UNIT_SECONDS = 1000
++MAX_NUM_OF_ALARM_ID = 128
++MIN_ALARM_ID = 1001
++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.warning(f"Invalid alarm_id {alarm_id}")
++        return
+     timestamp = xalarm_gettime(alarm_info)
+     if not timestamp:
+         logging.error("Retrieve timestamp failed")
 @@ -77,7 +84,19 @@ def alarm_register():
-             logging.info(f"alarm_register: {task_name} is registered")
-             task = TasksMap.tasks_dict[task_type][task_name]
-             alarm_id = task.alarm_id
-+            if alarm_id < MIN_ALARM_ID or alarm_id > MAX_ALARM_ID:
-+                logging.warnning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm")
-+                continue
-             alarm_clear_time = task.alarm_clear_time
-+            try:
-+                alarm_clear_time = int(alarm_clear_time)
-+                if alarm_clear_time <= 0:
-+                    raise ValueError("Not a positive integer")
-+                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")
-+                continue
-             alarm_list_dict[alarm_id] = []
-             task_alarm_id_dict[task_name] = alarm_id
-             if alarm_id not in alarm_id_clear_time_dict:
+             logging.info(f"alarm_register: {task_name} is registered")
+             task = TasksMap.tasks_dict[task_type][task_name]
+             alarm_id = task.alarm_id
++            if alarm_id < MIN_ALARM_ID or alarm_id > MAX_ALARM_ID:
++                logging.warning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm")
++                continue
+             alarm_clear_time = task.alarm_clear_time
++            try:
++                alarm_clear_time = int(alarm_clear_time)
++                if alarm_clear_time <= 0:
++                    raise ValueError("Not a positive integer")
++                if alarm_clear_time > sys.maxsize:
++                    raise ValueError("Exceeds maximum value for int")
++            except (ValueError, OverflowError, TypeError) as e:
++                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
+             if alarm_id not in alarm_id_clear_time_dict:
 diff --git a/src/python/syssentry/load_mods.py b/src/python/syssentry/load_mods.py
 index ae05e57..7daf17d 100644
 --- a/src/python/syssentry/load_mods.py
-- 
Gitee