Skip to content

Commit 63edcf5

Browse files
committed
add
1 parent a9688cb commit 63edcf5

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

tencentcloud/services/rum/service_tencentcloud_rum.go

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ import (
44
"context"
55
"log"
66
"strconv"
7-
"time"
8-
9-
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
107

118
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
129

1310
rum "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum/v20210622"
1411

12+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1513
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
1614
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
1715
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
@@ -90,8 +88,9 @@ func (me *RumService) DeleteRumTawInstanceById(ctx context.Context, instanceId s
9088

9189
func (me *RumService) DescribeRumProject(ctx context.Context, id string) (project *rum.RumProject, errRet error) {
9290
var (
93-
logId = tccommon.GetLogId(ctx)
94-
request = rum.NewDescribeProjectsRequest()
91+
logId = tccommon.GetLogId(ctx)
92+
request = rum.NewDescribeProjectsRequest()
93+
response = rum.NewDescribeProjectsResponse()
9594
)
9695

9796
defer func() {
@@ -118,20 +117,24 @@ func (me *RumService) DescribeRumProject(ctx context.Context, id string) (projec
118117
request.Offset = &offset
119118
request.Limit = &pageSize
120119
ratelimit.Check(request.GetAction())
121-
ReTryDescribe:
122-
response, err := me.client.UseRumClient().DescribeProjects(request)
123-
if err != nil {
124-
// Exceeded request frequency limit
125-
if err.(*sdkErrors.TencentCloudSDKError).Code == "RequestLimitExceeded" {
126-
time.Sleep(time.Second * 1)
127-
goto ReTryDescribe
120+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
121+
result, err := me.client.UseRumClient().DescribeProjects(request)
122+
if err != nil {
123+
return tccommon.RetryError(err)
124+
} else {
125+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
126+
logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
128127
}
129128

130-
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
131-
logId, request.GetAction(), request.ToJsonString(), err.Error())
129+
response = result
130+
return nil
131+
})
132+
133+
if err != nil {
132134
errRet = err
133135
return
134136
}
137+
135138
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
136139
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
137140

0 commit comments

Comments
 (0)