61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
|
From 3eba5dcde10e05e7badc99852f76488e667d56e6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: caixiaomeng <caixiaomeng2@.com>
|
||
|
|
Date: Mon, 21 Oct 2024 11:57:37 +0800
|
||
|
|
Subject: [PATCH] fix xalarm non-uniform log formatting
|
||
|
|
|
||
|
|
---
|
||
|
|
src/python/xalarm/sentry_notify.py | 11 ++++++-----
|
||
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/python/xalarm/sentry_notify.py b/src/python/xalarm/sentry_notify.py
|
||
|
|
index 5838473..ffe4147 100644
|
||
|
|
--- a/src/python/xalarm/sentry_notify.py
|
||
|
|
+++ b/src/python/xalarm/sentry_notify.py
|
||
|
|
@@ -2,6 +2,7 @@ import os
|
||
|
|
import sys
|
||
|
|
import time
|
||
|
|
import socket
|
||
|
|
+import logging
|
||
|
|
from struct import error as StructParseError
|
||
|
|
|
||
|
|
from .xalarm_api import alarm_stu2bin, Xalarm
|
||
|
|
@@ -27,21 +28,21 @@ ALARM_SOCKET_PERMISSION = 0o700
|
||
|
|
|
||
|
|
def check_params(alarm_id, alarm_level, alarm_type, puc_paras) -> bool:
|
||
|
|
if not os.path.exists(DIR_XALARM):
|
||
|
|
- sys.stderr.write(f"check_params: {DIR_XALARM} not exist, failed\n")
|
||
|
|
+ logging.error(f"check_params: {DIR_XALARM} not exist, failed")
|
||
|
|
return False
|
||
|
|
|
||
|
|
if not os.path.exists(PATH_REPORT_ALARM):
|
||
|
|
- sys.stderr.write(f"check_params: {PATH_REPORT_ALARM} not exist, failed\n")
|
||
|
|
+ logging.error(f"check_params: {PATH_REPORT_ALARM} not exist, failed")
|
||
|
|
return False
|
||
|
|
|
||
|
|
if (alarm_id < MIN_ALARM_ID or alarm_id > MAX_ALARM_ID or
|
||
|
|
alarm_level < MINOR_ALM or alarm_level > CRITICAL_ALM or
|
||
|
|
alarm_type < ALARM_TYPE_OCCUR or alarm_type > ALARM_TYPE_RECOVER):
|
||
|
|
- sys.stderr.write("check_params: alarm info invalid\n")
|
||
|
|
+ logging.error("check_params: alarm info invalid")
|
||
|
|
return False
|
||
|
|
|
||
|
|
if len(puc_paras) >= MAX_PUC_PARAS_LEN:
|
||
|
|
- sys.stderr.write(f"check_params: alarm msg should be less than {MAX_PUC_PARAS_LEN}\n")
|
||
|
|
+ logging.error(f"check_params: alarm msg should be less than {MAX_PUC_PARAS_LEN}")
|
||
|
|
return False
|
||
|
|
|
||
|
|
return True
|
||
|
|
@@ -61,7 +62,7 @@ def xalarm_report(alarm_id, alarm_level, alarm_type, puc_paras) -> bool:
|
||
|
|
|
||
|
|
sock.sendto(alarm_stu2bin(alarm_info), PATH_REPORT_ALARM)
|
||
|
|
except (FileNotFoundError, StructParseError, socket.error, OSError, UnicodeError) as e:
|
||
|
|
- sys.stderr.write(f"check_params: error occurs when sending msg.{e}\n")
|
||
|
|
+ logging.error(f"error occurs when sending msg.")
|
||
|
|
return False
|
||
|
|
finally:
|
||
|
|
sock.close()
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|
||
|
|
|