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

Tweak order in destinationQueue.next

Browse source
This commit is contained in:
Neil Alexander 2020-04-03 10:32:47 +01:00
parent f646964e85
commit b15b5c7f0d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationsender/queue/destinationqueue.go
View file

@ -112,6 +112,11 @@ func (oq *destinationQueue) next() *gomatrixserverlib.Transaction {
oq.runningMutex.Lock() oq.runningMutex.Lock()
defer oq.runningMutex.Unlock() defer oq.runningMutex.Unlock()
if len(oq.pendingEvents) == 0 && len(oq.pendingEDUs) == 0 && len(oq.pendingInvites) == 0 {
oq.running = false
return nil
}
if len(oq.pendingInvites) > 0 { if len(oq.pendingInvites) > 0 {
for _, inviteReq := range oq.pendingInvites { for _, inviteReq := range oq.pendingInvites {
ev := inviteReq.Event() ev := inviteReq.Event()
@ -131,11 +136,6 @@ func (oq *destinationQueue) next() *gomatrixserverlib.Transaction {
oq.pendingInvites = oq.pendingInvites[:0] oq.pendingInvites = oq.pendingInvites[:0]
} }
if len(oq.pendingEvents) == 0 && len(oq.pendingEDUs) == 0 {
oq.running = false
return nil
}
t := gomatrixserverlib.Transaction{ t := gomatrixserverlib.Transaction{
PDUs: []json.RawMessage{}, PDUs: []json.RawMessage{},
EDUs: []gomatrixserverlib.EDU{}, EDUs: []gomatrixserverlib.EDU{},