unistack-org/micro-client-drpc
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

add message metadata support #29

Merged
vtolstov merged 1 commits from md into master 2022-03-05 19:14:55 +03:00
Conversation 0 Commits 1 Files Changed 1 +14 -12
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4e19335534 - Show all commits

26
drpc.go
View File

@ -2,7 +2,6 @@
package drpc // import "go.unistack.org/micro-client-drpc/v3" package drpc // import "go.unistack.org/micro-client-drpc/v3"
import ( import (
"bytes"
"context" "context"
"fmt" "fmt"
"net" "net"
@ -615,6 +614,8 @@ func (c *drpcClient) Publish(ctx context.Context, msg client.Message, opts ...cl
} }
func (c *drpcClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error { func (c *drpcClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
var body []byte
options := client.NewPublishOptions(opts...) options := client.NewPublishOptions(opts...)
// get proxy // get proxy
@ -633,24 +634,22 @@ func (c *drpcClient) publish(ctx context.Context, ps []client.Message, opts ...c
for _, p := range ps { for _, p := range ps {
md := metadata.Copy(omd) md := metadata.Copy(omd)
md[metadata.HeaderContentType] = p.ContentType() md[metadata.HeaderContentType] = p.ContentType()
md[metadata.HeaderTopic] = p.Topic()
cf, err := c.newCodec(p.ContentType())
if err != nil {
return errors.InternalServerError("go.micro.client", err.Error())
}
var body []byte
// passed in raw data // passed in raw data
if d, ok := p.Payload().(*codec.Frame); ok { if d, ok := p.Payload().(*codec.Frame); ok {
body = d.Data body = d.Data
} else { } else {
b := bytes.NewBuffer(nil) // use codec for payload
if err := cf.Write(b, &codec.Message{Type: codec.Event}, p.Payload()); err != nil { cf, err := c.newCodec(p.ContentType())
if err != nil {
return errors.InternalServerError("go.micro.client", err.Error()) return errors.InternalServerError("go.micro.client", err.Error())
} }
body = b.Bytes() // set the body
b, err := cf.Marshal(p.Payload())
if err != nil {
return errors.InternalServerError("go.micro.client", err.Error())
}
body = b
} }
topic := p.Topic() topic := p.Topic()
@ -658,6 +657,9 @@ func (c *drpcClient) publish(ctx context.Context, ps []client.Message, opts ...c
topic = exchange topic = exchange
} }
for k, v := range p.Metadata() {
md.Set(k, v)
}
md.Set(metadata.HeaderTopic, topic) md.Set(metadata.HeaderTopic, topic)
msgs = append(msgs, &broker.Message{Header: md, Body: body}) msgs = append(msgs, &broker.Message{Header: md, Body: body})
} }