collab/hmq
3
0
Fork 0
mirror of https://github.com/fhmq/hmq.git synced 2026-08-31 23:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

update retained message even if it's already there (#70)

Browse Source 
Signed-off-by: Liu Qing <winglq@gmail.com>
This commit is contained in:
winglq
2020-01-06 11:22:59 +08:00
committed by joy.zhou
parent fb453e8c0f
commit 1971b5c324
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/lib/topics/memtopics.go
+3 -5
View File
@@ -104,7 +104,7 @@ func (this *memTopics) Retain(msg *packets.PublishPacket) error {
return this.rroot.rremove([]byte(msg.TopicName)) return this.rroot.rremove([]byte(msg.TopicName))
} }
return this.rroot.rinsert([]byte(msg.TopicName), msg) return this.rroot.rinsertOrUpdate([]byte(msg.TopicName), msg)
} }
func (this *memTopics) Retained(topic []byte, msgs *[]*packets.PublishPacket) error { func (this *memTopics) Retained(topic []byte, msgs *[]*packets.PublishPacket) error {
@@ -286,13 +286,11 @@ func newRNode() *rnode {
} }
} }
func (this *rnode) rinsert(topic []byte, msg *packets.PublishPacket) error { func (this *rnode) rinsertOrUpdate(topic []byte, msg *packets.PublishPacket) error {
// If there's no more topic levels, that means we are at the matching rnode. // If there's no more topic levels, that means we are at the matching rnode.
if len(topic) == 0 { if len(topic) == 0 {
// Reuse the message if possible // Reuse the message if possible
if this.msg == nil {
this.msg = msg this.msg = msg
}
return nil return nil
} }
@@ -315,7 +313,7 @@ func (this *rnode) rinsert(topic []byte, msg *packets.PublishPacket) error {
this.rnodes[level] = n this.rnodes[level] = n
} }
return n.rinsert(rem, msg) return n.rinsertOrUpdate(rem, msg)
} }
// Remove the retained message for the supplied topic // Remove the retained message for the supplied topic