unistack-org/micro-client-http
4
0
Fork 2
Code Issues 2 Pull Requests Actions 1 Packages Projects Releases 64 Wiki Activity

Fix breaks related to removing node.port

Browse Source
This commit is contained in:
Asim Aslam
2019-07-08 08:43:21 +01:00
committed by Vasiliy Tolstov
parent 214a98c3d2
commit aa101624c2
2 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
http.go
View File

@@ -57,10 +57,6 @@ func (h *httpClient) next(request client.Request, opts client.CallOptions) (sele
func (h *httpClient) call(ctx context.Context, node *registry.Node, req client.Request, rsp interface{}, opts client.CallOptions) error {
// set the address
address := node.Address
if node.Port > 0 {
address = fmt.Sprintf("%s:%d", address, node.Port)
}
header := make(http.Header)
if md, ok := metadata.FromContext(ctx); ok {
for k, v := range md {
@@ -125,10 +121,6 @@ func (h *httpClient) call(ctx context.Context, node *registry.Node, req client.R
func (h *httpClient) stream(ctx context.Context, node *registry.Node, req client.Request, opts client.CallOptions) (client.Stream, error) {
// set the address
address := node.Address
if node.Port > 0 {
address = fmt.Sprintf("%s:%d", address, node.Port)
}
header := make(http.Header)
if md, ok := metadata.FromContext(ctx); ok {
for k, v := range md {
@@ -351,11 +343,6 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
return nil, errors.InternalServerError("go.micro.client", err.Error())
}
addr := node.Address
if node.Port > 0 {
addr = fmt.Sprintf("%s:%d", addr, node.Port)
}
stream, err := h.stream(ctx, node, req, callOpts)
h.opts.Selector.Mark(req.Service(), node, err)
return stream, err