diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-02-17 15:58:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 15:58:54 +0000 |
| commit | 0b123b29f5304603d32d790512c091ac942fb37d (patch) | |
| tree | d452fd12e3e2c4f347877effd11efa4041e1eb08 /roomserver/internal/input | |
| parent | 140077265e2842bf8e2d2c6399343490740cd8a6 (diff) | |
Use process context for roomserver input (#2198)
Diffstat (limited to 'roomserver/internal/input')
| -rw-r--r-- | roomserver/internal/input/input.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go index 5bdec0a2..22e4b67a 100644 --- a/roomserver/internal/input/input.go +++ b/roomserver/internal/input/input.go @@ -31,6 +31,7 @@ import ( "github.com/matrix-org/dendrite/roomserver/internal/query" "github.com/matrix-org/dendrite/roomserver/storage" "github.com/matrix-org/dendrite/setup/jetstream" + "github.com/matrix-org/dendrite/setup/process" "github.com/matrix-org/gomatrixserverlib" "github.com/nats-io/nats.go" "github.com/prometheus/client_golang/prometheus" @@ -59,6 +60,7 @@ var keyContentFields = map[string]string{ } type Inputer struct { + ProcessContext *process.ProcessContext DB storage.Database JetStream nats.JetStreamContext Durable nats.SubOpt @@ -115,7 +117,7 @@ func (r *Inputer) Start() error { _ = msg.InProgress() // resets the acknowledgement wait timer defer eventsInProgress.Delete(index) defer roomserverInputBackpressure.With(prometheus.Labels{"room_id": roomID}).Dec() - action, err := r.processRoomEventUsingUpdater(context.Background(), roomID, &inputRoomEvent) + action, err := r.processRoomEventUsingUpdater(r.ProcessContext.Context(), roomID, &inputRoomEvent) if err != nil { if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) { sentry.CaptureException(err) |