From 1925cd7c0b8ecaef0318d87ce2ef725b3bbf9253 Mon Sep 17 00:00:00 2001
From: Light-Alex <245212467@qq.com>
Date: Fri, 26 Jul 2024 11:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=20Modification=E3=80=91=E6=95=85=E9=9A=9C=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE=E5=BC=82=E5=B8=B8=E5=80=BC?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=83=A8=E5=88=86=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BC=98=E5=8C=96=20=E3=80=90=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=BA=20Modifier=E3=80=91yanchuanxiang?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/common/fault_code.go | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkg/common/fault_code.go b/pkg/common/fault_code.go
index 0fd04e1e..334cd591 100644
--- a/pkg/common/fault_code.go
+++ b/pkg/common/fault_code.go
@@ -542,20 +542,22 @@ func validateFaultFrequencyCustomization(customization FaultFrequencyCustomizati
 		hwlog.RunLog.Warnf("empty event id in this FaultFrequency, skip")
 		return false
 	}
+	invalidMsg := "FaultFrequency configuration of this part will be invalid"
 	if customization.TimeWindow > MaxFaultFrequencyTimeWindow || customization.TimeWindow < MinFaultFrequencyTimeWindow {
-		hwlog.RunLog.Warnf("TimeWindow(%d) in this FaultFrequency exceeds limit(%d~%d), skip",
-			customization.TimeWindow, MinFaultFrequencyTimeWindow, MaxFaultFrequencyTimeWindow)
+		hwlog.RunLog.Warnf("EventIDs: %v, TimeWindow(%d) in this FaultFrequency exceeds limit(%d~%d). %s",
+			customization.EventId, customization.TimeWindow, MinFaultFrequencyTimeWindow, MaxFaultFrequencyTimeWindow,
+			invalidMsg)
 		return false
 	}
 	if customization.Times > MaxFaultFrequencyTimes || customization.Times < MinFaultFrequencyTimes {
-		hwlog.RunLog.Warnf("Times(%d) in this FaultFrequency exceeds limit(%d~%d), skip",
-			customization.Times, MinFaultFrequencyTimes, MaxFaultFrequencyTimes)
+		hwlog.RunLog.Warnf("EventIDs: %v, Times(%d) in this FaultFrequency exceeds limit(%d~%d). %s",
+			customization.EventId, customization.Times, MinFaultFrequencyTimes, MaxFaultFrequencyTimes, invalidMsg)
 		return false
 	}
 	if !FaultTypeSet.Has(customization.FaultHandling) {
-		hwlog.RunLog.Warnf("FaultHandling(%s) in this FaultFrequency is unrecognized, skip. "+
-			"The supported range of FaultHandling in this FaultFrequency is %v",
-			customization.FaultHandling, FaultTypeSet.List())
+		hwlog.RunLog.Warnf("EventIDs: %v, FaultHandling(%s) in this FaultFrequency is unrecognized. "+
+			"The supported range of FaultHandling in this FaultFrequency is %v. %s",
+			customization.EventId, customization.FaultHandling, FaultTypeSet.List(), invalidMsg)
 		return false
 	}
 	return true
@@ -566,22 +568,25 @@ func validateFaultDurationCustomization(faultDurationCustomization FaultDuration
 		hwlog.RunLog.Warnf("empty event id in this FaultDuration, skip")
 		return false
 	}
+	invalidMsg := "FaultDuration configuration of this part will be invalid"
 	if faultDurationCustomization.FaultTimeout > MaxFaultTimeout ||
 		faultDurationCustomization.FaultTimeout < MinFaultTimeout {
-		hwlog.RunLog.Warnf("FaultTimeout(%d) in this FaultDuration exceeds limit(%d~%d), skip",
-			faultDurationCustomization.FaultTimeout, MinFaultTimeout, MaxFaultTimeout)
+		hwlog.RunLog.Warnf("EventIDs: %v, FaultTimeout(%d) in this FaultDuration exceeds limit(%d~%d). %s",
+			faultDurationCustomization.EventId, faultDurationCustomization.FaultTimeout,
+			MinFaultTimeout, MaxFaultTimeout, invalidMsg)
 		return false
 	}
 	if faultDurationCustomization.RecoverTimeout > MaxRecoverTimeout ||
 		faultDurationCustomization.RecoverTimeout < MinRecoverTimeout {
-		hwlog.RunLog.Warnf("RecoverTimeout(%d) in this FaultDuration exceeds limit(%d~%d), skip",
-			faultDurationCustomization.RecoverTimeout, MinRecoverTimeout, MaxRecoverTimeout)
+		hwlog.RunLog.Warnf("EventIDs: %v, RecoverTimeout(%d) in this FaultDuration exceeds limit(%d~%d). %s",
+			faultDurationCustomization.EventId, faultDurationCustomization.RecoverTimeout,
+			MinRecoverTimeout, MaxRecoverTimeout, invalidMsg)
 		return false
 	}
 	if !FaultDurationTypeSet.Has(faultDurationCustomization.FaultHandling) {
-		hwlog.RunLog.Warnf("FaultHandling(%s) in this FaultDuration is unrecognized, skip. "+
-			"The supported range of FaultHandling in this FaultDuration is %v",
-			faultDurationCustomization.FaultHandling, FaultDurationTypeSet.List())
+		hwlog.RunLog.Warnf("EventIDs: %v, FaultHandling(%s) in this FaultDuration is unrecognized. "+
+			"The supported range of FaultHandling in this FaultDuration is %v. %s", faultDurationCustomization.EventId,
+			faultDurationCustomization.FaultHandling, FaultDurationTypeSet.List(), invalidMsg)
 		return false
 	}
 	return true
-- 
Gitee