Merge branch 'master' into matthew/peeking

This commit is contained in:
Matthew Hodgson 2020-09-01 19:11:51 +03:00
commit d0d5f70105
15 changed files with 32 additions and 26 deletions

View file

@ -122,7 +122,7 @@ func Open(dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches)
d.Database = shared.Database{
DB: d.db,
Cache: cache,
Writer: sqlutil.NewExclusiveWriter(),
Writer: d.writer,
EventsTable: d.events,
EventTypesTable: d.eventTypes,
EventStateKeysTable: d.eventStateKeys,