37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
|
From 8f28a40ffd7dc7aa969a7bfc0a170ed0c8f03bce Mon Sep 17 00:00:00 2001
|
||
|
|
From: jinsaihang <jinsaihang@h-partners.com>
|
||
|
|
Date: Tue, 22 Oct 2024 20:28:59 +0800
|
||
|
|
Subject: [PATCH] fix get_alarm error
|
||
|
|
|
||
|
|
Signed-off-by: jinsaihang <jinsaihang@h-partners.com>
|
||
|
|
---
|
||
|
|
sysSentry-1.0.2/src/python/syssentry/alarm.py | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/python/syssentry/alarm.py b/src/python/syssentry/alarm.py
|
||
|
|
index c3f2ee1..2575307 100644
|
||
|
|
--- a/src/python/syssentry/alarm.py
|
||
|
|
+++ b/src/python/syssentry/alarm.py
|
||
|
|
@@ -139,8 +139,6 @@ def get_alarm_result(task_name: str, time_range: int, detailed: bool) -> List[Di
|
||
|
|
return []
|
||
|
|
alarm_id = task_alarm_id_dict[task_name]
|
||
|
|
clear_time = alarm_id_clear_time_dict[alarm_id]
|
||
|
|
- if clear_time < int(time_range):
|
||
|
|
- return []
|
||
|
|
if alarm_id not in alarm_list_dict:
|
||
|
|
logging.debug("alarm_id does not exist")
|
||
|
|
return []
|
||
|
|
@@ -154,6 +152,9 @@ def get_alarm_result(task_name: str, time_range: int, detailed: bool) -> List[Di
|
||
|
|
if timestamp - (xalarm_gettime(alarm_list[i])) / MILLISECONDS_UNIT_SECONDS > time_range:
|
||
|
|
stop_index = i
|
||
|
|
break
|
||
|
|
+ if timestamp - (xalarm_gettime(alarm_list[i])) / MILLISECONDS_UNIT_SECONDS > clear_time:
|
||
|
|
+ stop_index = i
|
||
|
|
+ break
|
||
|
|
if stop_index >= 0:
|
||
|
|
alarm_list = alarm_list[:stop_index]
|
||
|
|
logging.debug(f"get_alarm_result: final alarm_list of {alarm_id} has {len(alarm_list)} elements")
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|