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

Prevent anymore messages from being received after ctx is cancelled. #1

Closed
wants to merge 1 commit into from
Closed

Prevent anymore messages from being received after ctx is cancelled. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 25 additions & 10 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,32 @@ func (c *MCSClient) readMessages(ctx context.Context, mcs *mcs) error {
return errors.Wrap(err, "receive version failed")
}

for ctx.Err() == nil {
for {
// receive tag
data, err := mcs.PerformReadTag()
if err != nil {
return errors.Wrap(err, "receive tag failed")
} else if data == nil {
return ErrFcmNotEnoughData
} else if ctx.Err() != nil {
break
dataCh := make(chan any)
errCh := make(chan error)
go func() {
data, err := mcs.PerformReadTag()
if err != nil {
errCh <- err
return
}

if data == nil {
errCh <- ErrFcmNotEnoughData
} else {
dataCh <- data
}
}()

var data any
select {
case <-ctx.Done():
return ctx.Err()
case d := <-dataCh:
data = d
case err := <-errCh:
return err
}

err = c.onDataMessage(data)
Expand All @@ -169,8 +186,6 @@ func (c *MCSClient) readMessages(ctx context.Context, mcs *mcs) error {
}
}
}

return nil
}

func (c *MCSClient) AckStreamPosition(mcs *mcs) error {
Expand Down
Loading