优化错误处理相关代码

internal/waf/rule_group.go

@@ -1,9 +1,8 @@
 package waf
 
 import (
-	"errors"
+	"fmt"
 	"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
-	"github.com/iwind/TeaGo/types"
 )
 
 // rule group
@@ -32,7 +31,7 @@ func (this *RuleGroup) Init(waf *WAF) error {
 		for _, set := range this.RuleSets {
 			err := set.Init(waf)
 			if err != nil {
-				return errors.New("init set '" + types.String(set.Id) + "' failed: " + err.Error())
+				return fmt.Errorf("init set '%d' failed: %w", set.Id, err)
 			}
 		}
 	}

internal/waf/rule_set.go

@@ -1,7 +1,7 @@
 package waf
 
 import (
-	"errors"
+	"fmt"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
@@ -49,7 +49,7 @@ func (this *RuleSet) Init(waf *WAF) error {
 		for _, rule := range this.Rules {
 			err := rule.Init()
 			if err != nil {
-				return errors.New("init rule '" + rule.Param + " " + rule.Operator + " " + types.String(rule.Value) + "' failed: " + err.Error())
+				return fmt.Errorf("init rule '%s %s %s' failed: %w", rule.Param, rule.Operator, types.String(rule.Value), err)
 			}
 		}