Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix multi subscribes handling for the same single topic #10

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix multi subscribes handling for the same single topic #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393464e
Fix multi subscribe handling for single topic
tymonx Apr 12, 2022
d05a48b
Add more proper msg distribution for N subscribers
Apr 13, 2022
c232938
Add channel index in logs.
Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 41 additions & 17 deletions pkg/http/subscriber.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type Subscriber struct {

logger watermill.LoggerAdapter

outputChannels []chan *message.Message
outputChannels map[string][]chan *message.Message
outputChannelsLock sync.Locker

closed bool
Expand All @@ -89,7 +89,7 @@ func NewSubscriber(addr string, config SubscriberConfig, logger watermill.Logger
config: config,
server: s,
logger: logger,
outputChannels: make([]chan *message.Message, 0),
outputChannels: make(map[string][]chan *message.Message),
outputChannelsLock: &sync.Mutex{},
}, nil
}
Expand All @@ -104,7 +104,8 @@ func (s *Subscriber) Subscribe(ctx context.Context, url string) (<-chan *message
messages := make(chan *message.Message)

s.outputChannelsLock.Lock()
s.outputChannels = append(s.outputChannels, messages)
s.outputChannels[url] = append(s.outputChannels[url], messages)
channels := s.outputChannels[url]
s.outputChannelsLock.Unlock()

baseLogFields := watermill.LogFields{"url": url, "provider": ProviderName}
Expand Down Expand Up @@ -133,20 +134,41 @@ func (s *Subscriber) Subscribe(ctx context.Context, url string) (<-chan *message

logFields := baseLogFields.Add(watermill.LogFields{"message_uuid": msg.UUID})

s.logger.Trace("Sending msg", logFields)
messages <- msg
var acked, nacked, cancelled int

s.logger.Trace("Waiting for ACK", logFields)
select {
case <-msg.Acked():
s.logger.Trace("Message acknowledged", logFields.Add(watermill.LogFields{"err": err}))
w.WriteHeader(http.StatusOK)
case <-msg.Nacked():
s.logger.Trace("Message nacked", logFields.Add(watermill.LogFields{"err": err}))
w.WriteHeader(http.StatusInternalServerError)
case <-r.Context().Done():
s.logger.Info("Request stopped without ACK received", logFields)
for index, channel := range channels {
m := msg.Copy()

m.SetContext(ctx)

s.logger.Trace("Sending msg", logFields.Add(watermill.LogFields{"index": index}))
channel <- m
s.logger.Trace("Waiting for ACK", logFields.Add(watermill.LogFields{"index": index}))

select {
case <-m.Acked():
s.logger.Trace("Message acknowledged", logFields.Add(watermill.LogFields{"index": index}))
acked++
case <-m.Nacked():
s.logger.Trace("Message nacked", logFields.Add(watermill.LogFields{"index": index}))
nacked++
case <-r.Context().Done():
s.logger.Info("Request stopped without ACK received", logFields.Add(watermill.LogFields{"index": index}))
cancelled++
}
}

s.logger.Trace("Messages send", logFields.Add(watermill.LogFields{
"total": len(channels),
"nacked": nacked,
"acked": acked,
"cancelled": cancelled,
}))

if (cancelled != 0) || (nacked != 0) || (acked == 0) {
w.WriteHeader(http.StatusInternalServerError)
} else {
w.WriteHeader(http.StatusOK)
}
})

Expand Down Expand Up @@ -187,8 +209,10 @@ func (s *Subscriber) Close() error {
return err
}

for _, ch := range s.outputChannels {
close(ch)
for _, channels := range s.outputChannels {
for _, ch := range channels {
close(ch)
}
}

return nil
Expand Down