hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use GME context for roomserver queuing

Browse source
This commit is contained in:
Neil Alexander 2021-06-29 14:13:44 +01:00
parent efb9588a36
commit 957b3787c2
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
federationapi/routing/send.go
View file

@ -734,7 +734,7 @@ func (t *txnReq) processEventWithMissingState(
// newly resolved state. This marks the "oldest" point in the backfill and
// sets the baseline state for any new events after this.
err = api.SendEventWithState(
context.Background(),
gmectx,
t.rsAPI,
api.KindOld,
resolvedState,
@ -754,7 +754,7 @@ func (t *txnReq) processEventWithMissingState(
headeredNewEvents[i] = newEvent.Headered(roomVersion)
}
if err = api.SendEvents(
context.Background(),
gmectx,
t.rsAPI,
api.KindOld,
append(headeredNewEvents, e.Headered(roomVersion)),

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

@ -64,6 +64,11 @@ func (w *inputWorker) start() {
if !ok {
continue
}
select {
case <-task.ctx.Done():
continue
default:
}
hooks.Run(hooks.KindNewEventReceived, task.event.Event)
_, task.err = w.r.processRoomEvent(task.ctx, task.event)
if task.err == nil {
@ -122,7 +127,7 @@ func (r *Inputer) WriteOutputEvents(roomID string, updates []api.OutputEvent) er
// InputRoomEvents implements api.RoomserverInternalAPI
func (r *Inputer) InputRoomEvents(
_ context.Context,
ctx context.Context,
request *api.InputRoomEventsRequest,
response *api.InputRoomEventsResponse,
) {
@ -154,7 +159,7 @@ func (r *Inputer) InputRoomEvents(
// the wait group, so that the worker can notify us when this specific
// task has been finished.
tasks[i] = &inputTask{
ctx: context.Background(),
ctx: ctx,
event: &request.InputRoomEvents[i],
wg: wg,
}
@ -166,19 +171,17 @@ func (r *Inputer) InputRoomEvents(
worker.input.push(tasks[i])
}
/*
// Wait for all of the workers to return results about our tasks.
wg.Wait()
// Wait for all of the workers to return results about our tasks.
wg.Wait()
// If any of the tasks returned an error, we should probably report
// that back to the caller.
for _, task := range tasks {
if task.err != nil {
response.ErrMsg = task.err.Error()
_, rejected := task.err.(*gomatrixserverlib.NotAllowed)
response.NotAllowed = rejected
return
}
// If any of the tasks returned an error, we should probably report
// that back to the caller.
for _, task := range tasks {
if task.err != nil {
response.ErrMsg = task.err.Error()
_, rejected := task.err.(*gomatrixserverlib.NotAllowed)
response.NotAllowed = rejected
return
}
*/
}
}