From 4a4159a9f6757bcd07a39ab4d668ce96313c1fb7 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Sun, 18 Aug 2019 11:28:21 +0100 Subject: [PATCH] Force grpc client/server to use grpc codec for broker --- subscriber.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/subscriber.go b/subscriber.go index 3bd4abe..1f885ca 100644 --- a/subscriber.go +++ b/subscriber.go @@ -1,18 +1,15 @@ package grpc import ( - "bytes" "context" "fmt" "reflect" "strings" "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/codec" "github.com/micro/go-micro/metadata" "github.com/micro/go-micro/registry" "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/buf" ) const ( @@ -175,7 +172,7 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke msg.Header["Content-Type"] = defaultContentType ct = defaultContentType } - cf, err := g.newCodec(ct) + cf, err := g.newGRPCCodec(ct) if err != nil { return err } @@ -205,15 +202,7 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke req = req.Elem() } - b := buf.New(bytes.NewBuffer(msg.Body)) - co := cf(b) - defer co.Close() - - if err := co.ReadHeader(&codec.Message{}, codec.Event); err != nil { - return err - } - - if err := co.ReadBody(req.Interface()); err != nil { + if err := cf.Unmarshal(msg.Body, req.Interface()); err != nil { return err }