opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7990 from ioito/hotfix/qx-google-not-found

Browse Source 
fix: avoid not reture cloudprovider.ErrNotFound error
This commit is contained in:
yunion-ci-robot
2020-09-22 21:13:25 +08:00
committed by GitHub
parent ce37cef67a 37b87d1a50
commit 12ce2ded4a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/google/google.go
+6 -4
View File
@@ -814,9 +814,11 @@ func (g *gError) ParseErrorFromJsonResponse(statusCode int, body jsonutils.JSONO
func _jsonRequest(cli *http.Client, method httputils.THttpMethod, url string, body jsonutils.JSONObject, debug bool) (jsonutils.JSONObject, error) {
client := httputils.NewJsonClient(cli)
req := httputils.NewJsonRequest(method, url, body)
var ge gError
var err error
var data jsonutils.JSONObject
for i := 0; i < MAX_RETRY; i++ {
_, data, err := client.Send(context.Background(), req, &ge, debug)
var ge gError
_, data, err = client.Send(context.Background(), req, &ge, debug)
if err == nil {
return data, nil
}
@@ -835,9 +837,9 @@ func _jsonRequest(cli *http.Client, method httputils.THttpMethod, url string, bo
continue
}
}
return nil, &ge
return nil, err
}
return nil, &ge
return nil, err
}
func (self *SGoogleClient) GetRegion(regionId string) *SRegion {