优化访问日志策略测试时的失败提示

This commit is contained in:
刘祥超
2022-08-05 19:11:21 +08:00
parent e582e37c06
commit 14ba7f6899
3 changed files with 8 additions and 5 deletions

View File

@@ -1,7 +1,6 @@
// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
//go:build !plus //go:build !plus
// +build !plus
package accesslogs package accesslogs
@@ -10,6 +9,6 @@ import (
) )
// 写入日志 // 写入日志
func (this *StorageManager) Write(policyId int64, accessLogs []*pb.HTTPAccessLog) error { func (this *StorageManager) Write(policyId int64, accessLogs []*pb.HTTPAccessLog) (success bool, failMessage string, err error) {
return nil return false, "only works in plus version", nil
} }

View File

@@ -43,7 +43,7 @@ func (this *HTTPAccessLogService) CreateHTTPAccessLogs(ctx context.Context, req
return nil, err return nil, err
} }
if policyId > 0 { if policyId > 0 {
err = accesslogs.SharedStorageManager.Write(policyId, req.HttpAccessLogs) _, _, err = accesslogs.SharedStorageManager.Write(policyId, req.HttpAccessLogs)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -2,6 +2,7 @@ package services
import ( import (
"context" "context"
"errors"
"github.com/TeaOSLab/EdgeAPI/internal/accesslogs" "github.com/TeaOSLab/EdgeAPI/internal/accesslogs"
"github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/db/models"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -153,9 +154,12 @@ func (this *HTTPAccessLogPolicyService) WriteHTTPAccessLogPolicy(ctx context.Con
return nil, err return nil, err
} }
err = accesslogs.SharedStorageManager.Write(req.HttpAccessLogPolicyId, []*pb.HTTPAccessLog{req.HttpAccessLog}) success, failMessage, err := accesslogs.SharedStorageManager.Write(req.HttpAccessLogPolicyId, []*pb.HTTPAccessLog{req.HttpAccessLog})
if err != nil { if err != nil {
return nil, err return nil, err
} }
if !success {
return nil, errors.New("test failed: " + failMessage)
}
return this.Success() return this.Success()
} }