From aee933f8785e7a7998105f6090f514d18051a1bd Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 9 Jul 2020 12:22:41 +0100 Subject: [PATCH] Un-goroutine the goroutines --- federationsender/queue/destinationqueue.go | 1 - federationsender/queue/queue.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/federationsender/queue/destinationqueue.go b/federationsender/queue/destinationqueue.go index de4d487ee..82cb343f3 100644 --- a/federationsender/queue/destinationqueue.go +++ b/federationsender/queue/destinationqueue.go @@ -353,7 +353,6 @@ func (oq *destinationQueue) nextTransaction( // If we didn't get anything from the database and there are no // pending EDUs then there's nothing to do - stop here. if len(pdus) == 0 && len(pendingEDUs) == 0 { - log.Warnf("Expected PDUs/EDUs for destination %q but got none", oq.destination) return false, nil } diff --git a/federationsender/queue/queue.go b/federationsender/queue/queue.go index 0858d813f..2288689ee 100644 --- a/federationsender/queue/queue.go +++ b/federationsender/queue/queue.go @@ -136,7 +136,7 @@ func (oqs *OutgoingQueues) SendEvent( } for _, destination := range destinations { - go oqs.getQueue(destination).sendEvent(nid) + oqs.getQueue(destination).sendEvent(nid) } return nil