From 3f4e95fb76b9efd46c5fca34ce61cec875cb54dc Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 26 Jan 2022 15:32:52 +0000 Subject: [PATCH] Fix blacklist again, remove unnecessary duplicate context --- roomserver/internal/input/input.go | 4 +--- sytest-blacklist | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go index c29fa930c..1dbe903f2 100644 --- a/roomserver/internal/input/input.go +++ b/roomserver/internal/input/input.go @@ -141,10 +141,8 @@ func (r *Inputer) InputRoomEvents( roomserverInputBackpressure.With(prometheus.Labels{"room_id": roomID}).Inc() worker := r.workerForRoom(roomID) worker.Act(nil, func() { - reqctx, cancel := context.WithTimeout(ctx, MaximumProcessingTime) - defer cancel() defer roomserverInputBackpressure.With(prometheus.Labels{"room_id": roomID}).Dec() - err := r.processRoomEvent(reqctx, &inputRoomEvent) + err := r.processRoomEvent(ctx, &inputRoomEvent) if err != nil { sentry.CaptureException(err) } else { diff --git a/sytest-blacklist b/sytest-blacklist index 16be56681..3e08f0cb4 100644 --- a/sytest-blacklist +++ b/sytest-blacklist @@ -32,4 +32,3 @@ Remove group role # See https://github.com/matrix-org/sytest/pull/1142 Device list doesn't change if remote server is down -If a device list update goes missing, the server resyncs on the next one