Skip to content

[ISSUE #487] Implement Unsubscribe method for push consumer #626

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

Merged
merged 2 commits into from
Mar 16, 2021
Merged

[ISSUE #487] Implement Unsubscribe method for push consumer #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea0725a
Implement Unsubscribe method for push consumer
Mar 13, 2021
5f3e386
Fix retry topic subscription still sent by heartbeat
Mar 15, 2021
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
13 changes: 12 additions & 1 deletion consumer/push_consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,14 @@ func (pc *pushConsumer) Subscribe(topic string, selector MessageSelector,
return errors.New("cannot subscribe topic since client either failed to start or has been shutdown.")
}

// add retry topic subscription for resubscribe
retryTopic := internal.GetRetryTopic(pc.consumerGroup)
_, exists := pc.subscriptionDataTable.Load(retryTopic)
if !exists {
sub := buildSubscriptionData(retryTopic, MessageSelector{TAG, _SubAll})
pc.subscriptionDataTable.Store(retryTopic, sub)
}

if pc.option.Namespace != "" {
topic = pc.option.Namespace + "%" + topic
}
Expand All @@ -241,7 +249,10 @@ func (pc *pushConsumer) Subscribe(topic string, selector MessageSelector,
return nil
}

func (pc *pushConsumer) Unsubscribe(string) error {
func (pc *pushConsumer) Unsubscribe(topic string) error {
pc.subscriptionDataTable.Delete(topic)
retryTopic := internal.GetRetryTopic(pc.consumerGroup)
pc.subscriptionDataTable.Delete(retryTopic)
return nil
}

Expand Down
17 changes: 17 additions & 0 deletions consumer/push_consumer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,23 @@ func TestStart(t *testing.T) {
return ConsumeSuccess, nil
})

_, exists := c.subscriptionDataTable.Load("TopicTest")
So(exists, ShouldBeTrue)

err = c.Unsubscribe("TopicTest")
So(err, ShouldBeNil)
_, exists = c.subscriptionDataTable.Load("TopicTest")
So(exists, ShouldBeFalse)

err = c.Subscribe("TopicTest", MessageSelector{}, func(ctx context.Context,
msgs ...*primitive.MessageExt) (ConsumeResult, error) {
fmt.Printf("subscribe callback: %v \n", msgs)
return ConsumeSuccess, nil
})

_, exists = c.subscriptionDataTable.Load("TopicTest")
So(exists, ShouldBeTrue)

client.EXPECT().ClientID().Return("127.0.0.1@DEFAULT")
client.EXPECT().Start().Return()
client.EXPECT().RegisterConsumer(gomock.Any(), gomock.Any()).Return(nil)
Expand Down