mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't accidentally drop queued messages

Browse source
This commit is contained in:
Neil Alexander 2020-05-05 17:02:27 +01:00
parent 88c8e0038f
commit ade8352045
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
federationsender/queue/destinationqueue.go
View file

@ -124,9 +124,11 @@ func (oq *destinationQueue) sendEvent(ev *gomatrixserverlib.HeaderedEvent) {
// If the destination is blacklisted then drop the event. // If the destination is blacklisted then drop the event.
return return
} }
fmt.Println("Queuing event", ev.EventID())
oq.runningMutex.Lock() oq.runningMutex.Lock()
oq.pendingPDUs = append(oq.pendingPDUs, ev) oq.pendingPDUs = append(oq.pendingPDUs, ev)
oq.runningMutex.Unlock() oq.runningMutex.Unlock()
fmt.Println("Queued event", ev.EventID())
oq.wake() oq.wake()
} }
@ -204,8 +206,8 @@ func (oq *destinationQueue) backgroundSend() {
// the pending events and EDUs. // the pending events and EDUs.
if transaction { if transaction {
oq.runningMutex.Lock() oq.runningMutex.Lock()
oq.pendingPDUs = oq.pendingPDUs[:0] oq.pendingPDUs = oq.pendingPDUs[len(pendingPDUs):]
oq.pendingEDUs = oq.pendingEDUs[:0] oq.pendingEDUs = oq.pendingEDUs[len(pendingEDUs):]
oq.runningMutex.Unlock() oq.runningMutex.Unlock()
} }
} }
@ -224,7 +226,7 @@ func (oq *destinationQueue) backgroundSend() {
// the pending invites. // the pending invites.
if invites { if invites {
oq.runningMutex.Lock() oq.runningMutex.Lock()
oq.pendingInvites = oq.pendingInvites[:0] oq.pendingInvites = oq.pendingInvites[len(pendingInvites):]
oq.runningMutex.Unlock() oq.runningMutex.Unlock()
} }
} }