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

minor content-type fixes

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-04-16 17:09:29 +03:00
parent 2b16a8a7a6
commit 6ccb40bab0
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
http.go
View File

@ -12,6 +12,7 @@ import (
"net/url" "net/url"
"os" "os"
"strings" "strings"
"sync"
"time" "time"
"github.com/unistack-org/micro/v3/broker" "github.com/unistack-org/micro/v3/broker"
@ -37,6 +38,7 @@ type httpClient struct {
dialer *net.Dialer dialer *net.Dialer
httpcli *http.Client httpcli *http.Client
init bool init bool
sync.RWMutex
} }
func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg interface{}, opts client.CallOptions) (*http.Request, error) { func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg interface{}, opts client.CallOptions) (*http.Request, error) {
@ -148,9 +150,9 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
// get codec // get codec
switch ct { switch ct {
case "application/x-www-form-urlencoded": case "application/x-www-form-urlencoded":
cf, err = h.newCodec(strings.Split(DefaultContentType, ";")[0]) cf, err = h.newCodec(DefaultContentType)
default: default:
cf, err = h.newCodec(strings.Split(ct, ";")[0]) cf, err = h.newCodec(ct)
} }
if err != nil { if err != nil {
@ -208,7 +210,7 @@ func (h *httpClient) stream(ctx context.Context, addr string, req client.Request
header.Set("Content-Type", ct) header.Set("Content-Type", ct)
// get codec // get codec
cf, err := h.newCodec(strings.Split(req.ContentType(), ";")[0]) cf, err := h.newCodec(ct)
if err != nil { if err != nil {
return nil, errors.InternalServerError("go.micro.client", err.Error()) return nil, errors.InternalServerError("go.micro.client", err.Error())
} }
@ -238,6 +240,13 @@ func (h *httpClient) stream(ctx context.Context, addr string, req client.Request
} }
func (h *httpClient) newCodec(ct string) (codec.Codec, error) { func (h *httpClient) newCodec(ct string) (codec.Codec, error) {
h.RLock()
defer h.RUnlock()
if idx := strings.IndexRune(ct, ';'); idx >= 0 {
ct = ct[:idx]
}
if c, ok := h.opts.Codecs[ct]; ok { if c, ok := h.opts.Codecs[ct]; ok {
return c, nil return c, nil
} }
@ -560,7 +569,7 @@ func (h *httpClient) Publish(ctx context.Context, p client.Message, opts ...clie
md["Content-Type"] = p.ContentType() md["Content-Type"] = p.ContentType()
md["Micro-Topic"] = p.Topic() md["Micro-Topic"] = p.Topic()
cf, err := h.newCodec(strings.Split(p.ContentType(), ";")[0]) cf, err := h.newCodec(p.ContentType())
if err != nil { if err != nil {
return errors.InternalServerError("go.micro.client", err.Error()) return errors.InternalServerError("go.micro.client", err.Error())
} }