8000 fix(sdk): improve error log on seek error by sguiheux · Pull Request #5794 · ovh/cds · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(sdk): improve error log on seek error #5794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 15, 2021
Merged

fix(sdk): improve error log on seek error #5794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
893ad50
fix: improve error
sguiheux Apr 15, 2021
dd84632
fix(sdk): use no timeout client on cdn upload
sguiheux Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/cdsclient/client_cdn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ func (c *client) CDNItemUpload(ctx context.Context, cdnAddr string, signature st
if err != nil {
return time.Since(t0), err
}
_, _, _, err = c.Request(ctx, http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature))
if err != nil {
if _, _, _, err := c.Stream(ctx, c.HTTPNoTimeoutClient(), http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature)); err != nil {
savedError = newAPIError(fmt.Errorf("unable to upload file, try %d: %v", i+1, err))
time.Sleep(1 * time.Second)
continue
}
//_, _, _, err = c.Request(ctx, http.MethodPost, fmt.Sprintf("%s/item/upload", cdnAddr), f, SetHeader("X-CDS-WORKER-SIGNATURE", signature))
savedError = nil
break
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/cdsclient/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ func (c *client) Stream(ctx context.Context, httpClient HTTPClient, method strin
var requestError error
if rs, ok := body.(io.ReadSeeker); ok {
if _, err := rs.Seek(0, 0); err != nil {
return nil, nil, 0, newError(fmt.Errorf("request failed after %d retries: %v", i, err))
return nil, nil, 0, newError(fmt.Errorf("request failed after %d retries: %v. Original error: %v", i, err, savederror))
}
req, requestError = http.NewRequest(method, url, body)
} else {
Expand Down
0