oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-14 09:06:56 +00:00
Code Wiki Activity

FindFirstNewMessage can return -1

Browse source
This commit is contained in:
Kane York 2015-10-27 18:47:27 -07:00
parent 2fd1817627
commit e9801e6ca3
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
socketserver/internal/server/backlog.go
View file

@ -124,7 +124,6 @@ func DumpCache() {
PersistentLSMLock.Lock() PersistentLSMLock.Lock()
PersistentLastMessages = make(map[Command]map[string]LastSavedMessage) PersistentLastMessages = make(map[Command]map[string]LastSavedMessage)
// TODO delete file?
PersistentLSMLock.Unlock() PersistentLSMLock.Unlock()
CacheListsLock.Lock() CacheListsLock.Lock()
@ -177,34 +176,38 @@ func SendTimedBacklogMessages(client *ClientInfo, disconnectTime time.Time) {
globIdx := FindFirstNewMessage(tgmarray(CachedGlobalMessages), disconnectTime) globIdx := FindFirstNewMessage(tgmarray(CachedGlobalMessages), disconnectTime)
for i := globIdx; i < len(CachedGlobalMessages); i++ { if globIdx != -1 {
item := CachedGlobalMessages[i] for i := globIdx; i < len(CachedGlobalMessages); i++ {
msg := ClientMessage{MessageID: -1, Command: item.Command, origArguments: item.Data} item := CachedGlobalMessages[i]
msg.parseOrigArguments() msg := ClientMessage{MessageID: -1, Command: item.Command, origArguments: item.Data}
client.MessageChannel <- msg msg.parseOrigArguments()
client.MessageChannel <- msg
}
} }
chanIdx := FindFirstNewMessage(tmmarray(CachedChannelMessages), disconnectTime) chanIdx := FindFirstNewMessage(tmmarray(CachedChannelMessages), disconnectTime)
for i := chanIdx; i < len(CachedChannelMessages); i++ { if chanIdx != -1 {
item := CachedChannelMessages[i] for i := chanIdx; i < len(CachedChannelMessages); i++ {
var send bool item := CachedChannelMessages[i]
for _, channel := range item.Channels { var send bool
for _, matchChannel := range client.CurrentChannels { for _, channel := range item.Channels {
if channel == matchChannel { for _, matchChannel := range client.CurrentChannels {
send = true if channel == matchChannel {
send = true
break
}
}
if send {
break break
} }
} }
if send { if send {
break msg := ClientMessage{MessageID: -1, Command: item.Command, origArguments: item.Data}
msg.parseOrigArguments()
client.MessageChannel <- msg
} }
} }
if send {
msg := ClientMessage{MessageID: -1, Command: item.Command, origArguments: item.Data}
msg.parseOrigArguments()
client.MessageChannel <- msg
}
} }
CacheListsLock.RUnlock() CacheListsLock.RUnlock()