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

well this is tedious

Browse source
This commit is contained in:
Neil Alexander 2020-07-01 10:54:37 +01:00
parent 9ef7147772
commit cfbdff3c32
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
federationsender/queue/destinationqueue.go
View file

@ -169,11 +169,10 @@ func (oq *destinationQueue) backgroundSend() {
// PDUs in the database. Otherwise we'll generate one later on,
// e.g. in response to EDUs.
transactionID := gomatrixserverlib.TransactionID("")
pendingPDUs := oq.pendingPDUs.Load()
// If we have nothing to do then wait either for incoming events, or
// until we hit an idle timeout.
if pendingPDUs == 0 {
if oq.pendingPDUs.Load() == 0 && len(oq.pendingEDUs) == 0 && len(oq.pendingInvites) == 0 {
select {
case <-oq.wakeServerCh:
// We were woken up because there are new PDUs waiting in the
@ -228,7 +227,7 @@ func (oq *destinationQueue) backgroundSend() {
}
// If we have pending PDUs or EDUs then construct a transaction.
if pendingPDUs > 0 || len(oq.pendingEDUs) > 0 {
if oq.pendingPDUs.Load() > 0 || len(oq.pendingEDUs) > 0 {
// If we haven't got a transaction ID then we should generate
// one. Ideally we'd know this already because something queued
// in the database would give us one, but if we're dealing with