From 67eb0a66e52d7b09504c181298648f706d7ae47e Mon Sep 17 00:00:00 2001 From: jinsaihang Date: Mon, 14 Oct 2024 19:49:07 +0800 Subject: [PATCH] modify print log Signed-off-by: jinsaihang --- modify-print-log.patch | 60 ++++++++++++++++++++++++++++++++++++++++++ sysSentry.spec | 9 ++++++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 modify-print-log.patch diff --git a/modify-print-log.patch b/modify-print-log.patch new file mode 100644 index 0000000..13b29ac --- /dev/null +++ b/modify-print-log.patch @@ -0,0 +1,60 @@ +From 5b7ed0703501015821f502f8dfc1ba1147f50001 Mon Sep 17 00:00:00 2001 +From: jinsaihang +Date: Mon, 14 Oct 2024 16:46:30 +0800 +Subject: [PATCH] modify print log + +Signed-off-by: jinsaihang +--- + sysSentry-1.0.2/src/python/syssentry/alarm.py | 2 +- + .../src/python/syssentry/load_mods.py | 17 ++++++++++++++--- + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/src/python/syssentry/alarm.py b/src/python/syssentry/alarm.py +index bff527c..deb51ef 100644 +--- a/src/python/syssentry/alarm.py ++++ b/src/python/syssentry/alarm.py +@@ -100,7 +100,7 @@ def alarm_register(): + 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.warning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm") ++ logging.warning(f"Invalid 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): +diff --git a/src/python/syssentry/load_mods.py b/src/python/syssentry/load_mods.py +index f74f165..00efb85 100644 +--- a/src/python/syssentry/load_mods.py ++++ b/src/python/syssentry/load_mods.py +@@ -199,14 +199,25 @@ def parse_mod_conf(mod_name, mod_conf): + + try: + task.alarm_id = int(mod_conf.get(CONF_TASK, CONF_ALARM_ID)) +- task.alarm_clear_time = int(mod_conf.get(CONF_TASK, CONF_ALARM_CLEAR_TIME)) + if not (MIN_ALARM_ID <= task.alarm_id <= MAX_ALARM_ID): + raise ValueError("Invalid alarm_id") + except ValueError: + task.alarm_id = mod_conf.get(CONF_TASK, CONF_ALARM_ID) +- task.alarm_clear_time = mod_conf.get(CONF_TASK, CONF_ALARM_CLEAR_TIME) ++ if task.alarm_id is None: ++ logging.warning(f"{mod_name} alarm_id not set") ++ task.alarm_clear_time = None + except configparser.NoOptionError: +- logging.warning("Unset alarm_clear_time, use 15s as default") ++ logging.warning(f"{mod_name} alarm_id not set") ++ task.alarm_id = None ++ task.alarm_clear_time = None ++ ++ if task.alarm_id is not None: ++ try: ++ task.alarm_clear_time = int(mod_conf.get(CONF_TASK, CONF_ALARM_CLEAR_TIME)) ++ except ValueError: ++ task.alarm_clear_time = mod_conf.get(CONF_TASK, CONF_ALARM_CLEAR_TIME) ++ except configparser.NoOptionError: ++ logging.warning(f"{mod_name} not set alarm_clear_time, use 15s as default") + + if CONF_ONSTART in mod_conf.options(CONF_TASK): + is_onstart = (mod_conf.get(CONF_TASK, CONF_ONSTART) == 'yes') +-- +2.27.0 + diff --git a/sysSentry.spec b/sysSentry.spec index 01dd22f..af07bc8 100644 --- a/sysSentry.spec +++ b/sysSentry.spec @@ -4,7 +4,7 @@ Summary: System Inspection Framework Name: sysSentry Version: 1.0.2 -Release: 43 +Release: 44 License: Mulan PSL v2 Group: System Environment/Daemons Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -59,6 +59,7 @@ 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 +Patch50: modify-print-log.patch BuildRequires: cmake gcc-c++ BuildRequires: python3 python3-setuptools @@ -331,6 +332,12 @@ rm -rf %{buildroot} %attr(0550,root,root) %{python3_sitelib}/sentryCollector/__pycache__/collect_plugin* %changelog +* Mon Oct 14 2024 jinsaihang - 1.0.2-44 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:modify print log + * Mon Oct 14 2024 jinsaihang - 1.0.2-43 - Type:bugfix - CVE:NA -- Gitee