增加服务流量统计

internal/caches/errors.go

@@ -0,0 +1,41 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+import "errors"
+
+// 常用的几个错误
+var (
+	ErrNotFound      = errors.New("cache not found")
+	ErrFileIsWriting = errors.New("the file is writing")
+	ErrInvalidRange  = errors.New("invalid range")
+)
+
+// CapacityError 容量错误
+// 独立出来是为了可以在有些场合下可以忽略，防止产生没必要的错误提示数量太多
+type CapacityError struct {
+	err string
+}
+
+func NewCapacityError(err string) error {
+	return &CapacityError{err: err}
+}
+
+func (this *CapacityError) Error() string {
+	return this.err
+}
+
+// CanIgnoreErr 检查错误是否可以忽略
+func CanIgnoreErr(err error) bool {
+	if err == nil {
+		return true
+	}
+	if err == ErrFileIsWriting {
+		return true
+	}
+	_, ok := err.(*CapacityError)
+	if ok {
+		return true
+	}
+	return false
+}

internal/caches/errros_test.go

@@ -0,0 +1,16 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+import (
+	"github.com/iwind/TeaGo/assert"
+	"testing"
+)
+
+func TestCanIgnoreErr(t *testing.T) {
+	a := assert.NewAssertion(t)
+
+	a.IsTrue(CanIgnoreErr(ErrFileIsWriting))
+	a.IsTrue(CanIgnoreErr(NewCapacityError("over capcity")))
+	a.IsFalse(CanIgnoreErr(ErrNotFound))
+}

internal/caches/storage_file.go

@@ -36,12 +36,6 @@ const (
 	SizeMeta = SizeExpiresAt + SizeStatus + SizeURLLength + SizeHeaderLength + SizeBodyLength
 )
 
-var (
-	ErrNotFound      = errors.New("cache not found")
-	ErrFileIsWriting = errors.New("the file is writing")
-	ErrInvalidRange  = errors.New("invalid range")
-)
-
 // FileStorage 文件缓存
 //   文件结构：
 //    [expires time] | [ status ] | [url length] | [header length] | [body length] | [url] [header data] [body data]
@@ -254,11 +248,11 @@ func (this *FileStorage) OpenWriter(key string, expiredAt int64, status int) (Wr
 		return nil, err
 	}
 	if this.policy.MaxKeys > 0 && count > this.policy.MaxKeys {
-		return nil, errors.New("write file cache failed: too many keys in cache storage")
+		return nil, NewCapacityError("write file cache failed: too many keys in cache storage")
 	}
 	capacityBytes := this.diskCapacityBytes()
 	if capacityBytes > 0 && capacityBytes <= this.totalSize {
-		return nil, errors.New("write file cache failed: over disk size, current total size: " + strconv.FormatInt(this.totalSize, 10) + " bytes, capacity: " + strconv.FormatInt(capacityBytes, 10))
+		return nil, NewCapacityError("write file cache failed: over disk size, current total size: " + strconv.FormatInt(this.totalSize, 10) + " bytes, capacity: " + strconv.FormatInt(capacityBytes, 10))
 	}
 
 	hash := stringutil.Md5(key)

internal/caches/storage_memory.go

@@ -3,7 +3,6 @@ package caches
 import (
 	"fmt"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/TeaOSLab/EdgeNode/internal/errors"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/cespare/xxhash"
 	"strconv"
@@ -126,11 +125,11 @@ func (this *MemoryStorage) OpenWriter(key string, expiredAt int64, status int) (
 		return nil, err
 	}
 	if this.policy.MaxKeys > 0 && totalKeys > this.policy.MaxKeys {
-		return nil, errors.New("write memory cache failed: too many keys in cache storage")
+		return nil, NewCapacityError("write memory cache failed: too many keys in cache storage")
 	}
 	capacityBytes := this.memoryCapacityBytes()
 	if capacityBytes > 0 && capacityBytes <= this.totalSize {
-		return nil, errors.New("write memory cache failed: over memory size: " + strconv.FormatInt(capacityBytes, 10) + ", current size: " + strconv.FormatInt(this.totalSize, 10) + " bytes")
+		return nil, NewCapacityError("write memory cache failed: over memory size: " + strconv.FormatInt(capacityBytes, 10) + ", current size: " + strconv.FormatInt(this.totalSize, 10) + " bytes")
 	}
 
 	// 先删除