From 47a9256d1ecf23d06be77a359657aba3968b4687 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 10 Feb 2020 14:10:36 +0000 Subject: [PATCH] Clean up expired events before sleep --- federationsender/queue/queue.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/federationsender/queue/queue.go b/federationsender/queue/queue.go index 09e8299b5..1b9532735 100644 --- a/federationsender/queue/queue.go +++ b/federationsender/queue/queue.go @@ -164,13 +164,14 @@ func (oqs *OutgoingQueues) SendEDU( func (oqs *OutgoingQueues) processRetries() { ctx := context.Background() for { - time.Sleep(retryInterval) if err := oqs.db.DeleteRetryExpiredEvents(ctx); err != nil { log.WithFields(log.Fields{ log.ErrorKey: err, }).Warn("Error cleaning expired retry events") } + time.Sleep(retryInterval) + retries, err := oqs.db.SelectRetryEventsPending(ctx) if err != nil { log.WithFields(log.Fields{