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

Update channels count with new items for include matching
All checks were successful
the build was successful
Details

Browse Source
This commit is contained in:
Peter Stuifzand 2018-08-15 20:08:03 +02:00
parent 3addbb50de
commit 03c7375064
Signed by: peter
GPG Key ID: 374322D56E5209E8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/eksterd/memory.go
View File

@ -650,6 +650,7 @@ func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel strin
// if regex matches item // if regex matches item
// - add item to channel // - add item to channel
var updatedChannels []string
for channelKey, setting := range b.Settings { for channelKey, setting := range b.Settings {
if setting.IncludeRegex != "" { if setting.IncludeRegex != "" {
included := false included := false
@ -666,10 +667,17 @@ func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel strin
if included { if included {
log.Printf("Included %#v\n", item) log.Printf("Included %#v\n", item)
b.channelAddItem(conn, channelKey, item) b.channelAddItem(conn, channelKey, item)
updatedChannels = append(updatedChannels, channelKey)
} }
} }
} }
// Update all channels that have added items, because of the include matching
for _, value := range updatedChannels {
b.updateChannelUnreadCount(conn, value)
}
// Check for the exclude regex
if setting, e := b.Settings[channel]; e { if setting, e := b.Settings[channel]; e {
if setting.ExcludeRegex != "" { if setting.ExcludeRegex != "" {
excludeRegex, err := regexp.Compile(setting.ExcludeRegex) excludeRegex, err := regexp.Compile(setting.ExcludeRegex)