新增:重复订阅主题检查

git-svn-id: svn://47.119.165.148/zhub@100 e63fbceb-bcc3-4977-ac22-735b83d8d0f4
This commit is contained in:
lxy
2021-02-05 03:48:58 +00:00
parent d8cef1751c
commit fb93177de7
2 changed files with 12 additions and 5 deletions

View File

@@ -14,8 +14,16 @@ type ZGroup struct { // ZGroup
}
func (g *ZGroup) appendTo(c *ZConn) {
topic := g.ztopic.topic
// report subscribe topic check
if c.substoped[topic] != nil {
return
}
c.substoped[topic] = make(chan int, 0)
c.appendTo(g.conns)
go func() { // 每个连接开启一个携程发送数据
go func() { // create new goroutine consumer message
for {
select {
case msg, ok := <-g.chMsg:
@@ -23,7 +31,7 @@ func (g *ZGroup) appendTo(c *ZConn) {
return
}
err := c.send("message", g.ztopic.topic, msg)
err := c.send("message", topic, msg)
if err != nil { // 失败处理
g.chMsg <- msg
return
@@ -31,7 +39,8 @@ func (g *ZGroup) appendTo(c *ZConn) {
atomic.AddInt32(&g.offset, 1)
case <-c.stoped:
return
case <-c.substoped[g.ztopic.topic]:
case <-c.substoped[topic]:
delete(c.substoped, topic)
return
}
}

View File

@@ -75,8 +75,6 @@ func (s *ZSub) subscribe(c *ZConn, topic string) { // 新增订阅 zconn{}
ztopic.groups[c.groupid] = zgroup
}
//zgroup.conns = c.appendTo(zgroup.conns)
c.substoped[topic] = make(chan int, 0)
zgroup.appendTo(c)
for i, item := range c.topics {