mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-30 10:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix blacklist again, remove unnecessary duplicate context

Browse source
This commit is contained in:
Neil Alexander 2022-01-26 15:32:52 +00:00
parent 261b1a3a2c
commit 3f4e95fb76
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/internal/input/input.go
View file

@ -141,10 +141,8 @@ func (r *Inputer) InputRoomEvents(
roomserverInputBackpressure.With(prometheus.Labels{"room_id": roomID}).Inc() roomserverInputBackpressure.With(prometheus.Labels{"room_id": roomID}).Inc()
worker := r.workerForRoom(roomID) worker := r.workerForRoom(roomID)
worker.Act(nil, func() { worker.Act(nil, func() {
reqctx, cancel := context.WithTimeout(ctx, MaximumProcessingTime)
defer cancel()
defer roomserverInputBackpressure.With(prometheus.Labels{"room_id": roomID}).Dec() defer roomserverInputBackpressure.With(prometheus.Labels{"room_id": roomID}).Dec()
err := r.processRoomEvent(reqctx, &inputRoomEvent) err := r.processRoomEvent(ctx, &inputRoomEvent)
if err != nil { if err != nil {
sentry.CaptureException(err) sentry.CaptureException(err)
} else { } else {

1
sytest-blacklist
View file

@ -32,4 +32,3 @@ Remove group role
# See https://github.com/matrix-org/sytest/pull/1142 # See https://github.com/matrix-org/sytest/pull/1142
Device list doesn't change if remote server is down Device list doesn't change if remote server is down
If a device list update goes missing, the server resyncs on the next one