peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Reuse updateChannelInRedis

Browse Source
This commit is contained in:
Peter Stuifzand 2018-10-03 18:59:53 +02:00
parent 9c3e884fd1
commit beba0e5120
Signed by: peter
GPG Key ID: 374322D56E5209E8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/eksterd/memory.go
View File

@ -123,8 +123,7 @@ func (b *memoryBackend) refreshChannels() {
b.lock.RLock() b.lock.RLock()
for uid, channel := range b.Channels { for uid, channel := range b.Channels {
log.Printf("loading channel %s - %s\n", uid, channel.Name) log.Printf("loading channel %s - %s\n", uid, channel.Name)
conn.Do("SADD", "channels", uid) updateChannelInRedis(conn, channel)
conn.Do("SETNX", "channel_sortorder_"+uid, 99999)
} }
b.lock.RUnlock() b.lock.RUnlock()
} }
@ -222,6 +221,12 @@ func (b *memoryBackend) setChannel(channel microsub.Channel) {
b.NextUid++ b.NextUid++
} }
func updateChannelInRedis(conn redis.Conn, channel microsub.Channel) {
uid := channel.UID
conn.Do("SADD", "channels", uid)
conn.Do("SETNX", "channel_sortorder_"+uid, 99999)
}
// ChannelsCreate creates a channels // ChannelsCreate creates a channels
func (b *memoryBackend) ChannelsCreate(name string) (microsub.Channel, error) { func (b *memoryBackend) ChannelsCreate(name string) (microsub.Channel, error) {
defer b.save() defer b.save()
@ -232,17 +237,11 @@ func (b *memoryBackend) ChannelsCreate(name string) (microsub.Channel, error) {
conn := pool.Get() conn := pool.Get()
defer conn.Close() defer conn.Close()
updateChannelInRedis(channel, conn) updateChannelInRedis(conn, channel)
return channel, nil return channel, nil
} }
func updateChannelInRedis(channel microsub.Channel, conn redis.Conn) {
uid := channel.UID
conn.Do("SADD", "channels", uid)
conn.Do("SETNX", "channel_sortorder_"+uid, 99999)
}
// ChannelsUpdate updates a channels // ChannelsUpdate updates a channels
func (b *memoryBackend) ChannelsUpdate(uid, name string) (microsub.Channel, error) { func (b *memoryBackend) ChannelsUpdate(uid, name string) (microsub.Channel, error) {
defer b.save() defer b.save()