unistack-org/micro-server-grpc
4
0
Fork 2
Code Issues 3 Pull Requests Actions Packages Projects Releases 48 Wiki Activity

Decruft the broker by removing Event interface (#1940)

Browse Source
This commit is contained in:
Asim Aslam 2020-08-18 14:00:51 +01:00 committed by Vasiliy Tolstov
parent 03af0bddc6
commit 242c0acf1e
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grpc.go
View File

@ -753,10 +753,6 @@ func (g *grpcServer) Register() error {
opts = append(opts, broker.SubscribeContext(cx)) opts = append(opts, broker.SubscribeContext(cx))
} }
if !sb.Options().AutoAck {
opts = append(opts, broker.DisableAutoAck())
}
if logger.V(logger.InfoLevel, logger.DefaultLogger) { if logger.V(logger.InfoLevel, logger.DefaultLogger) {
logger.Infof("Subscribing to topic: %s", sb.Topic()) logger.Infof("Subscribing to topic: %s", sb.Topic())
} }

3
subscriber.go
View File

@ -167,7 +167,7 @@ func validateSubscriber(sub server.Subscriber) error {
} }
func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broker.Handler { func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broker.Handler {
return func(p broker.Event) (err error) { return func(msg *broker.Message) (err error) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
@ -179,7 +179,6 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke
} }
}() }()
msg := p.Message()
// if we don't have headers, create empty map // if we don't have headers, create empty map
if msg.Header == nil { if msg.Header == nil {
msg.Header = make(map[string]string) msg.Header = make(map[string]string)