diff --git a/go.mod b/go.mod index a848987..f06ec66 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/dchest/siphash v1.2.1 github.com/go-ole/go-ole v1.2.4 // indirect github.com/go-yaml/yaml v2.1.0+incompatible - github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e + github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f github.com/shirou/gopsutil v2.20.9+incompatible golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 google.golang.org/grpc v1.32.0 diff --git a/go.sum b/go.sum index 1cde562..33fdc9d 100644 --- a/go.sum +++ b/go.sum @@ -56,6 +56,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e h1:/xn7wUvlwaoA5IkdBUctv2OQbJSZ0/Dw8qRJmn55sJk= github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= +github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f h1:6Ws2H+eorfVUoMO2jta6A9nIdh8oi5/5LXo/LkAxR+E= +github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= diff --git a/internal/caches/manager.go b/internal/caches/manager.go index a6a7b88..2206f85 100644 --- a/internal/caches/manager.go +++ b/internal/caches/manager.go @@ -3,6 +3,7 @@ package caches import ( "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeNode/internal/logs" + "github.com/iwind/TeaGo/lists" "strconv" "sync" ) @@ -34,7 +35,7 @@ func (this *Manager) UpdatePolicies(newPolicies []*serverconfigs.HTTPCachePolicy // 停止旧有的 for _, oldPolicy := range this.policyMap { - if !this.containsInt64(newPolicyIds, oldPolicy.Id) { + if !lists.ContainsInt64(newPolicyIds, oldPolicy.Id) { logs.Error("CACHE", "remove policy "+strconv.FormatInt(oldPolicy.Id, 10)) delete(this.policyMap, oldPolicy.Id) storage, ok := this.storageMap[oldPolicy.Id] @@ -130,13 +131,3 @@ func (this *Manager) NewStorageWithPolicy(policy *serverconfigs.HTTPCachePolicy) } return nil } - -// 可判断一组数字中是否包含某数 -func (this *Manager) containsInt64(values []int64, value int64) bool { - for _, v := range values { - if v == value { - return true - } - } - return false -} diff --git a/internal/nodes/waf_manager.go b/internal/nodes/waf_manager.go index 57ab502..49309d2 100644 --- a/internal/nodes/waf_manager.go +++ b/internal/nodes/waf_manager.go @@ -52,16 +52,6 @@ func (this *WAFManager) FindWAF(policyId int64) *waf.WAF { return w } -// 判断是否包含int64 -func (this *WAFManager) containsInt64(values []int64, value int64) bool { - for _, v := range values { - if v == value { - return true - } - } - return false -} - // 将Policy转换为WAF func (this *WAFManager) convertWAF(policy *firewallconfigs.HTTPFirewallPolicy) (*waf.WAF, error) { if policy == nil {