From e067630887934f34855575c536591d969ea1bd56 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Mon, 18 Dec 2023 08:58:41 +0100
Subject: [PATCH] Increase AckWait to 5min to give federation requests more
 time

---
 roomserver/internal/input/input.go        | 6 ++++--
 roomserver/internal/input/input_events.go | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go
index fbcc18adf..a94371981 100644
--- a/roomserver/internal/input/input.go
+++ b/roomserver/internal/input/input.go
@@ -160,14 +160,16 @@ func (r *Inputer) startWorkerForRoom(roomID string) {
 		// The consumer already exists, try to update if necessary.
 		if info != nil {
 			switch {
+			case info.Config.AckWait.Nanoseconds() != consumerConfig.AckWait.Nanoseconds():
+				fallthrough
 			case info.Config.AckPolicy != consumerConfig.AckPolicy:
 				logger.Warn("Consumer already exists, trying to update it.")
 				// Try updating the consumer first
 				if _, err = w.r.JetStream.UpdateConsumer(streamName, consumerConfig); err != nil {
 					// We failed to update the consumer, recreate it
-					logger.WithError(err).Warnf("Unable to update consumer %q, recreating...", consumer)
+					logger.WithError(err).Warn("Unable to update consumer, recreating...")
 					if err = w.r.JetStream.DeleteConsumer(streamName, consumer); err != nil {
-						logger.WithError(err).Fatalf("Unable to delete consumer %q", consumer)
+						logger.WithError(err).Fatal("Unable to delete consumer")
 						return
 					}
 					info = nil
diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go
index 520f82a80..f2737ec1c 100644
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@@ -49,7 +49,7 @@ import (
 )
 
 // TODO: Does this value make sense?
-const MaximumMissingProcessingTime = time.Minute * 2
+const MaximumMissingProcessingTime = time.Minute * 5
 
 var processRoomEventDuration = prometheus.NewHistogramVec(
 	prometheus.HistogramOpts{