discovery service
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
|
||||
"github.com/google/uuid"
|
||||
msg "github.com/tech/sendico/pkg/messaging"
|
||||
"github.com/tech/sendico/pkg/messaging/broker"
|
||||
mb "github.com/tech/sendico/pkg/messaging/broker"
|
||||
cons "github.com/tech/sendico/pkg/messaging/consumer"
|
||||
me "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
msgproducer "github.com/tech/sendico/pkg/messaging/producer"
|
||||
@@ -27,22 +27,22 @@ type Client struct {
|
||||
pending map[string]chan LookupResponse
|
||||
}
|
||||
|
||||
func NewClient(logger mlogger.Logger, broker broker.Broker, producer msg.Producer, sender string) (*Client, error) {
|
||||
if broker == nil {
|
||||
func NewClient(logger mlogger.Logger, msgBroker mb.Broker, producer msg.Producer, sender string) (*Client, error) {
|
||||
if msgBroker == nil {
|
||||
return nil, errors.New("discovery client: broker is nil")
|
||||
}
|
||||
if logger != nil {
|
||||
logger = logger.Named("discovery_client")
|
||||
}
|
||||
if producer == nil {
|
||||
producer = msgproducer.NewProducer(logger, broker)
|
||||
producer = msgproducer.NewProducer(logger, msgBroker)
|
||||
}
|
||||
sender = strings.TrimSpace(sender)
|
||||
if sender == "" {
|
||||
sender = "discovery_client"
|
||||
}
|
||||
|
||||
consumer, err := cons.NewConsumer(logger, broker, LookupResponseEvent())
|
||||
consumer, err := cons.NewConsumer(logger, msgBroker, LookupResponseEvent())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -57,7 +57,7 @@ func NewClient(logger mlogger.Logger, broker broker.Broker, producer msg.Produce
|
||||
|
||||
go func() {
|
||||
if err := consumer.ConsumeMessages(client.handleLookupResponse); err != nil && client.logger != nil {
|
||||
client.logger.Warn("Discovery lookup consumer stopped", zap.Error(err))
|
||||
client.logger.Warn("Discovery lookup consumer stopped", zap.String("event", LookupResponseEvent().ToString()), zap.Error(err))
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -112,7 +112,8 @@ func (c *Client) Lookup(ctx context.Context) (LookupResponse, error) {
|
||||
func (c *Client) handleLookupResponse(_ context.Context, env me.Envelope) error {
|
||||
var payload LookupResponse
|
||||
if err := json.Unmarshal(env.GetData(), &payload); err != nil {
|
||||
c.logWarn("Failed to decode discovery lookup response", zap.Error(err))
|
||||
fields := append(envelopeFields(env), zap.Int("data_len", len(env.GetData())), zap.Error(err))
|
||||
c.logWarn("Failed to decode discovery lookup response", fields...)
|
||||
return err
|
||||
}
|
||||
requestID := strings.TrimSpace(payload.RequestID)
|
||||
|
||||
Reference in New Issue
Block a user