go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-02-19 19:10:08 +02:00
Code Issues Releases Activity

transport/http: delay pass context.Context (#1684)

Browse Source 
* transport/http: fix http request do not with ctx from user
This commit is contained in:
Cluas 2021-12-13 14:30:34 +08:00 committed by GitHub
parent 5df28f4fdc
commit e1e8184768
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
transport/http/client.go
View File

@ -231,7 +231,7 @@ func (client *Client) Invoke(ctx context.Context, method, path string, args inte
func (client *Client) invoke(ctx context.Context, req *http.Request, args interface{}, reply interface{}, c callInfo, opts ...CallOption) error {
h := func(ctx context.Context, in interface{}) (interface{}, error) {
res, err := client.do(ctx, req, c)
res, err := client.do(req.WithContext(ctx))
if res != nil {
cs := csAttempt{res: res}
for _, o := range opts {
@ -263,19 +263,18 @@ func (client *Client) Do(req *http.Request, opts ...CallOption) (*http.Response,
return nil, err
}
}
ctx := req.Context()
return client.do(ctx, req, c)
return client.do(req)
}
func (client *Client) do(ctx context.Context, req *http.Request, c callInfo) (*http.Response, error) {
func (client *Client) do(req *http.Request) (*http.Response, error) {
var done func(context.Context, selector.DoneInfo)
if client.r != nil {
var (
err error
node selector.Node
)
if node, done, err = client.opts.selector.Select(ctx); err != nil {
if node, done, err = client.opts.selector.Select(req.Context()); err != nil {
return nil, errors.ServiceUnavailable("NODE_NOT_FOUND", err.Error())
}
if client.insecure {
@ -288,14 +287,14 @@ func (client *Client) do(ctx context.Context, req *http.Request, c callInfo) (*h
}
resp, err := client.cc.Do(req)
if err == nil {
err = client.opts.errorDecoder(ctx, resp)
err = client.opts.errorDecoder(req.Context(), resp)
}
if err != nil {
return nil, err
}
if done != nil {
done(ctx, selector.DoneInfo{Err: err})
done(req.Context(), selector.DoneInfo{Err: err})
}
return resp, nil
}