mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-02-07 19:44:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into neilalexander/devicelist

Browse source
This commit is contained in:
Neil Alexander 2020-12-14 14:42:33 +00:00
parent f4134ea7c6
commit 1bc1347ce4
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ func (r *Inputer) WriteOutputEvents(roomID string, updates []api.OutputEvent) er
// InputRoomEvents implements api.RoomserverInternalAPI // InputRoomEvents implements api.RoomserverInternalAPI
func (r *Inputer) InputRoomEvents( func (r *Inputer) InputRoomEvents(
ctx context.Context, _ context.Context,
request *api.InputRoomEventsRequest, request *api.InputRoomEventsRequest,
response *api.InputRoomEventsResponse, response *api.InputRoomEventsResponse,
) { ) {
@ -148,7 +148,7 @@ func (r *Inputer) InputRoomEvents(
// the wait group, so that the worker can notify us when this specific // the wait group, so that the worker can notify us when this specific
// task has been finished. // task has been finished.
tasks[i] = &inputTask{ tasks[i] = &inputTask{
ctx: ctx, ctx: context.Background(),
event: &request.InputRoomEvents[i], event: &request.InputRoomEvents[i],
wg: wg, wg: wg,
} }