From 77f6693fcf977234ee8e877749754d6e7d23a0c9 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 25 Jul 2025 15:13:50 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E5=87=8F=E5=B0=91=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E8=BF=9B=E8=A1=8C=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/oam/service/alarm.go | 9 --------- src/modules/oam/service/cdr.go | 2 -- src/modules/oam/service/kpi.go | 4 ---- src/modules/oam/service/nb_state.go | 2 -- src/modules/oam/service/ue_nb.go | 2 -- 5 files changed, 19 deletions(-) diff --git a/src/modules/oam/service/alarm.go b/src/modules/oam/service/alarm.go index bea08860..33d8cbe9 100644 --- a/src/modules/oam/service/alarm.go +++ b/src/modules/oam/service/alarm.go @@ -5,7 +5,6 @@ import ( "be.ems/src/framework/config" "be.ems/src/framework/constants" - "be.ems/src/framework/logger" "be.ems/src/framework/utils/parse" "github.com/tsmask/go-oam" @@ -44,7 +43,6 @@ func (s *Alarm) Resolve(a oam.Alarm) error { // 是否存在网元 neInfo := s.neInfoService.FindByRmuid(a.NeUid) if neInfo.NeType == "" || neInfo.RmUID != a.NeUid { - logger.Warnf("resolve alarm network element does not exist %s", a.NeUid) return fmt.Errorf("resolve alarm network element does not exist %s", a.NeUid) } @@ -80,12 +78,10 @@ func (s *Alarm) Resolve(a oam.Alarm) error { if a.AlarmStatus == oam.ALARM_STATUS_CLEAR { if a.PerceivedSeverity == oam.ALARM_SEVERITY_EVENT { if err := s.clearEvent(); err != nil { - logger.Warnf("resolve alarm clear event failed: %s", err.Error()) return err } } else { if err := s.clear(); err != nil { - logger.Warnf("resolve alarm clear failed: %s", err.Error()) return err } } @@ -95,12 +91,10 @@ func (s *Alarm) Resolve(a oam.Alarm) error { if a.AlarmStatus == oam.ALARM_STATUS_ACTIVE { if a.PerceivedSeverity == oam.ALARM_SEVERITY_EVENT { if err := s.addEvent(); err != nil { - logger.Warnf("resolve alarm add event failed: %s", err.Error()) return err } } else { if err := s.add(); err != nil { - logger.Warnf("resolve alarm add failed: %s", err.Error()) return err } } @@ -108,7 +102,6 @@ func (s *Alarm) Resolve(a oam.Alarm) error { // 记录日志 if err := s.saveLog(); err != nil { - logger.Warnf("resolve alarm save log failed: %s", err.Error()) return err } // 推送 @@ -265,7 +258,6 @@ func (s *Alarm) notify(neIp string) { emailErr := notificationService.EmailAlarm(s.alarm, neIp) if emailErr != nil { emailResult = emailErr.Error() - logger.Warnf("alarm notify email failed: %s", emailErr.Error()) } s.notifyLog("EMAIL", emailList, emailResult) } @@ -278,7 +270,6 @@ func (s *Alarm) notify(neIp string) { smscErr := notificationService.SMSCAlarm(s.alarm, neIp) if smscErr != nil { smscResult = smscErr.Error() - logger.Warnf("alarm notify email failed: %s", smscErr.Error()) } s.notifyLog("SMSC", mobileList, smscResult) } diff --git a/src/modules/oam/service/cdr.go b/src/modules/oam/service/cdr.go index 7173087d..8b1e2427 100644 --- a/src/modules/oam/service/cdr.go +++ b/src/modules/oam/service/cdr.go @@ -4,7 +4,6 @@ import ( "encoding/json" "fmt" - "be.ems/src/framework/logger" "github.com/tsmask/go-oam" neDataModel "be.ems/src/modules/network_data/model" @@ -35,7 +34,6 @@ func (s *CDR) Resolve(c oam.CDR) error { // 是否存在网元 neInfo := s.neInfoService.FindByRmuid(c.NeUid) if neInfo.NeType == "" || neInfo.RmUID != c.NeUid { - logger.Warnf("resolve cdr network element does not exist %s", c.NeUid) return fmt.Errorf("resolve cdr network element does not exist %s", c.NeUid) } diff --git a/src/modules/oam/service/kpi.go b/src/modules/oam/service/kpi.go index 832f4c7d..3a3766bf 100644 --- a/src/modules/oam/service/kpi.go +++ b/src/modules/oam/service/kpi.go @@ -5,7 +5,6 @@ import ( "fmt" "time" - "be.ems/src/framework/logger" "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/expr" "be.ems/src/framework/utils/parse" @@ -43,7 +42,6 @@ func (s *KPI) Resolve(k oam.KPI) error { // 是否存在网元 s.neInfo = s.neInfoService.FindByRmuid(k.NeUid) if s.neInfo.NeType == "" || s.neInfo.RmUID != k.NeUid { - logger.Warnf("resolve kpi network element does not exist %s", k.NeUid) return fmt.Errorf("resolve kpi network element does not exist %s", k.NeUid) } @@ -53,11 +51,9 @@ func (s *KPI) Resolve(k oam.KPI) error { index := int64(curSeconds) / k.Granularity if err := s.saveKPIData(k, index); err != nil { - logger.Warnf("resolve kpi data fail %s", k.NeUid) return err } if err := s.saveKPIDataC(k, index); err != nil { - logger.Warnf("resolve kpic data fail %s", k.NeUid) return err } return nil diff --git a/src/modules/oam/service/nb_state.go b/src/modules/oam/service/nb_state.go index bc283a54..3f85a49f 100644 --- a/src/modules/oam/service/nb_state.go +++ b/src/modules/oam/service/nb_state.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - "be.ems/src/framework/logger" "be.ems/src/framework/utils/date" "github.com/tsmask/go-oam" @@ -33,7 +32,6 @@ func (s *NBState) Resolve(n oam.NBState) error { // 是否存在网元 neInfo := s.neInfoService.FindByRmuid(n.NeUid) if neInfo.NeType == "" || neInfo.RmUID != n.NeUid { - logger.Warnf("resolve nb_state network element does not exist %s", n.NeUid) return fmt.Errorf("resolve nb_state network element does not exist %s", n.NeUid) } diff --git a/src/modules/oam/service/ue_nb.go b/src/modules/oam/service/ue_nb.go index 5a419049..55904013 100644 --- a/src/modules/oam/service/ue_nb.go +++ b/src/modules/oam/service/ue_nb.go @@ -4,7 +4,6 @@ import ( "encoding/json" "fmt" - "be.ems/src/framework/logger" "github.com/tsmask/go-oam" neDataModel "be.ems/src/modules/network_data/model" @@ -32,7 +31,6 @@ func (s *UENB) Resolve(u oam.UENB) error { // 是否存在网元 neInfo := s.neInfoService.FindByRmuid(u.NeUid) if neInfo.NeType == "" || neInfo.RmUID != u.NeUid { - logger.Warnf("resolve ue_nb network element does not exist %s", u.NeUid) return fmt.Errorf("resolve ue_nb network element does not exist %s", u.NeUid) }