BASIS/decort-golang-sdk
8
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.5.13

Browse Source
This commit is contained in:
Sergey Kisil
2023-11-30 15:01:53 +03:00
parent e496f8fb7e
commit 2677662789
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,7 +1,4 @@
## Version 1.5.12
## Version 1.5.13
### Bugfix
- Fix unhandled error in do() method for client and legacy-client
- Fix EOF error by closing request

15
client.go
View File

@@ -140,25 +140,22 @@ func (dc *DecortClient) do(req *http.Request) (*http.Response, error) {
req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
req.Header.Set("Accept", "application/json")
// var resp *http.Response
// var err error
buf, _ := io.ReadAll(req.Body)
// for i := uint64(0); i < dc.cfg.Retries; i++ {
// req = req.Clone(req.Context())
req.Body = io.NopCloser(bytes.NewBuffer(buf))
resp, err := dc.client.Do(req)
req.Close = true
if err != nil || resp == nil {
if strings.Contains(err.Error(),"connection reset by peer") {
if strings.Contains(err.Error(), "connection reset by peer") {
resp.Body.Close()
for i := uint64(0); i < dc.cfg.Retries; i++ {
time.Sleep(5 *time.Second)
time.Sleep(5 * time.Second)
resp, err = dc.client.Do(req)
if strings.Contains(err.Error(),"connection reset by peer") {
if strings.Contains(err.Error(), "connection reset by peer") {
resp.Body.Close()
continue
} else if err == nil {
break
break
} else if err != nil {
return nil, err
}
@@ -174,6 +171,6 @@ func (dc *DecortClient) do(req *http.Request) (*http.Response, error) {
respBytes, _ := io.ReadAll(resp.Body)
err = fmt.Errorf("%s", respBytes)
resp.Body.Close()
return nil, fmt.Errorf("could not execute request: %w", err)
}

12
legacy-client.go
View File

@@ -145,17 +145,18 @@ func (ldc *LegacyDecortClient) do(req *http.Request) (*http.Response, error) {
// req = req.Clone(req.Context())
req.Body = io.NopCloser(bytes.NewBuffer(buf))
resp, err := ldc.client.Do(req)
req.Close = true
if err != nil || resp == nil {
if strings.Contains(err.Error(),"connection reset by peer") {
if strings.Contains(err.Error(), "connection reset by peer") {
resp.Body.Close()
for i := uint64(0); i < ldc.cfg.Retries; i++ {
time.Sleep(5 *time.Second)
time.Sleep(5 * time.Second)
resp, err = ldc.client.Do(req)
if strings.Contains(err.Error(),"connection reset by peer") {
if strings.Contains(err.Error(), "connection reset by peer") {
resp.Body.Close()
continue
} else if err == nil {
break
break
} else if err != nil {
return nil, err
}
@@ -171,6 +172,7 @@ func (ldc *LegacyDecortClient) do(req *http.Request) (*http.Response, error) {
respBytes, _ := io.ReadAll(resp.Body)
err = fmt.Errorf("%s", respBytes)
resp.Body.Close()
// }
return nil, fmt.Errorf("could not execute request: %w", err)
}