From 7cf4daa210309c28298a02619d4452063be3530c Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 17 Feb 2021 15:01:07 +0000 Subject: [PATCH] Check blacklist properly --- federationsender/queue/queue.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/federationsender/queue/queue.go b/federationsender/queue/queue.go index d178f10ce..f32ae20fd 100644 --- a/federationsender/queue/queue.go +++ b/federationsender/queue/queue.go @@ -148,13 +148,13 @@ type queuedEDU struct { } func (oqs *OutgoingQueues) getQueue(destination gomatrixserverlib.ServerName) *destinationQueue { - if _, blacklisted := oqs.statistics.ForServer(destination).BackoffInfo(); blacklisted { + if oqs.statistics.ForServer(destination).Blacklisted() { return nil } oqs.queuesMutex.Lock() defer oqs.queuesMutex.Unlock() - oq := oqs.queues[destination] - if oq == nil { + oq, ok := oqs.queues[destination] + if !ok { destinationQueueTotal.Inc() oq = &destinationQueue{ queues: oqs,