mirror of
https://github.com/matrix-org/dendrite
synced 2024-12-15 07:42:58 +00:00
Fix roomserver deadlock (#380)
Move the mutex lock outside the loop so that we don't lock up if there is more than one event
This commit is contained in:
parent
ec30d143cd
commit
899f267c47
1 changed files with 3 additions and 4 deletions
|
@ -61,11 +61,10 @@ func (r *RoomserverInputAPI) InputRoomEvents(
|
||||||
request *api.InputRoomEventsRequest,
|
request *api.InputRoomEventsRequest,
|
||||||
response *api.InputRoomEventsResponse,
|
response *api.InputRoomEventsResponse,
|
||||||
) error {
|
) error {
|
||||||
for i := range request.InputRoomEvents {
|
// We lock as processRoomEvent can only be called once at a time
|
||||||
// We lock as processRoomEvent can ony be called once at a time
|
|
||||||
r.mutex.Lock()
|
r.mutex.Lock()
|
||||||
defer r.mutex.Unlock()
|
defer r.mutex.Unlock()
|
||||||
|
for i := range request.InputRoomEvents {
|
||||||
if err := processRoomEvent(ctx, r.DB, r, request.InputRoomEvents[i]); err != nil {
|
if err := processRoomEvent(ctx, r.DB, r, request.InputRoomEvents[i]); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue