From 14ba7f689922a7a968b298503e13e96110866a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Fri, 5 Aug 2022 19:11:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BF=E9=97=AE=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AD=96=E7=95=A5=E6=B5=8B=E8=AF=95=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/accesslogs/storage_manager_write.go | 5 ++--- internal/rpc/services/service_http_access_log.go | 2 +- internal/rpc/services/service_http_access_log_policy.go | 6 +++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/internal/accesslogs/storage_manager_write.go b/internal/accesslogs/storage_manager_write.go index 9710d0a1..f8b212f2 100644 --- a/internal/accesslogs/storage_manager_write.go +++ b/internal/accesslogs/storage_manager_write.go @@ -1,7 +1,6 @@ // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. //go:build !plus -// +build !plus package accesslogs @@ -10,6 +9,6 @@ import ( ) // 写入日志 -func (this *StorageManager) Write(policyId int64, accessLogs []*pb.HTTPAccessLog) error { - return nil +func (this *StorageManager) Write(policyId int64, accessLogs []*pb.HTTPAccessLog) (success bool, failMessage string, err error) { + return false, "only works in plus version", nil } diff --git a/internal/rpc/services/service_http_access_log.go b/internal/rpc/services/service_http_access_log.go index 0627d76e..43ed244c 100644 --- a/internal/rpc/services/service_http_access_log.go +++ b/internal/rpc/services/service_http_access_log.go @@ -43,7 +43,7 @@ func (this *HTTPAccessLogService) CreateHTTPAccessLogs(ctx context.Context, req return nil, err } if policyId > 0 { - err = accesslogs.SharedStorageManager.Write(policyId, req.HttpAccessLogs) + _, _, err = accesslogs.SharedStorageManager.Write(policyId, req.HttpAccessLogs) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_access_log_policy.go b/internal/rpc/services/service_http_access_log_policy.go index b9d4b458..7abdca15 100644 --- a/internal/rpc/services/service_http_access_log_policy.go +++ b/internal/rpc/services/service_http_access_log_policy.go @@ -2,6 +2,7 @@ package services import ( "context" + "errors" "github.com/TeaOSLab/EdgeAPI/internal/accesslogs" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -153,9 +154,12 @@ func (this *HTTPAccessLogPolicyService) WriteHTTPAccessLogPolicy(ctx context.Con 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 { return nil, err } + if !success { + return nil, errors.New("test failed: " + failMessage) + } return this.Success() }