go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-01-14 02:33:03 +02:00
Code Issues Releases Activity

feat(http): http client support service discovery in Do (#1563)

Browse Source
This commit is contained in:
letian 2021-11-05 16:47:34 +08:00 committed by GitHub
parent 4f013de2ec
commit 32272fe441
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
transport/http/client.go
View File

@ -232,27 +232,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 { 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) { h := func(ctx context.Context, in interface{}) (interface{}, 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 {
return nil, errors.ServiceUnavailable("NODE_NOT_FOUND", err.Error())
}
if client.insecure {
req.URL.Scheme = "http"
} else {
req.URL.Scheme = "https"
}
req.URL.Host = node.Address()
req.Host = node.Address()
}
res, err := client.do(ctx, req, c) res, err := client.do(ctx, req, c)
if done != nil {
done(ctx, selector.DoneInfo{Err: err})
}
if res != nil { if res != nil {
cs := csAttempt{res: res} cs := csAttempt{res: res}
for _, o := range opts { for _, o := range opts {
@ -284,16 +264,39 @@ func (client *Client) Do(req *http.Request, opts ...CallOption) (*http.Response,
return nil, err return nil, err
} }
} }
return client.do(req.Context(), req, c) ctx := req.Context()
return client.do(ctx, req, c)
} }
func (client *Client) do(ctx context.Context, req *http.Request, c callInfo) (*http.Response, error) { func (client *Client) do(ctx context.Context, req *http.Request, c callInfo) (*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 {
return nil, errors.ServiceUnavailable("NODE_NOT_FOUND", err.Error())
}
if client.insecure {
req.URL.Scheme = "http"
} else {
req.URL.Scheme = "https"
}
req.URL.Host = node.Address()
req.Host = node.Address()
}
resp, err := client.cc.Do(req) resp, err := client.cc.Do(req)
if err == nil {
err = client.opts.errorDecoder(ctx, resp)
}
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := client.opts.errorDecoder(ctx, resp); err != nil { if done != nil {
return nil, err done(ctx, selector.DoneInfo{Err: err})
} }
return resp, nil return resp, nil
} }