re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #658 from go-redis/fix/chan-once 

Create PubSub channel once
This commit is contained in:
Vladimir Mihailenco 2017-10-30 13:22:25 +03:00 committed by GitHub
parent 35248155a5 15f14b8305
commit 75ca398534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pubsub.go
View File

@ -29,6 +29,9 @@ type PubSub struct {
closed bool
cmd *Cmd
chOnce sync.Once
ch chan *Message
}
func (c *PubSub) conn() (*pool.Conn, error) {
@ -346,10 +349,12 @@ func (c *PubSub) receiveMessage(timeout time.Duration) (*Message, error) {
}
}
// Channel returns a channel for concurrently receiving messages.
// The channel is closed with PubSub.
// Channel returns a Go channel for concurrently receiving messages.
// The channel is closed with PubSub. Receive or ReceiveMessage APIs
// can not be used after channel is created.
func (c *PubSub) Channel() <-chan *Message {
ch := make(chan *Message, 100)
c.chOnce.Do(func() {
c.ch = make(chan *Message, 100)
go func() {
for {
msg, err := c.ReceiveMessage()
@ -359,11 +364,12 @@ func (c *PubSub) Channel() <-chan *Message {
}
continue
}
ch <- msg
c.ch <- msg
}
close(ch)
close(c.ch)
}()
return ch
})
return c.ch
}
func appendIfNotExists(ss []string, es ...string) []string {