aboutsummaryrefslogtreecommitdiff
path: root/matrix/rooms
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2019-04-27 15:02:52 +0300
committerTulir Asokan <tulir@maunium.net>2019-04-27 15:02:52 +0300
commit6f54066c43172fe0197e82fb1034c9ae55d1e1f2 (patch)
tree8136e34231de96d9557f2fc0f12e499ca6c2978f /matrix/rooms
parentbc7e2d9a1c871e3fbce932f9695fc24083bc2cc4 (diff)
Add partial deadlock detection in debug mode
Diffstat (limited to 'matrix/rooms')
-rw-r--r--matrix/rooms/room.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go
index 6334036..717636b 100644
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
@@ -21,9 +21,10 @@ import (
"fmt"
"os"
"sort"
- "sync"
"time"
+ sync "github.com/sasha-s/go-deadlock"
+
"maunium.net/go/mautrix"
"maunium.net/go/gomuks/debug"
@@ -450,7 +451,7 @@ func (room *Room) GetSessionOwner() string {
// NewRoom creates a new Room with the given ID
func NewRoom(roomID, owner string) *Room {
return &Room{
- Room: mautrix.NewRoom(roomID),
+ Room: mautrix.NewRoom(roomID),
SessionUserID: owner,
}
}