hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-01 22:02:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into matthew/peeking

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
syncapi/storage/postgres/syncserver.go
View file

@ -80,7 +80,7 @@ func NewDatabase(dbProperties *config.DatabaseOptions) (*SyncServerDatasource, e
}
d.Database = shared.Database{
DB: d.db,
Writer: sqlutil.NewDummyWriter(),
Writer: d.writer,
Invites: invites,
AccountData: accountData,
OutputEvents: events,

2
syncapi/storage/sqlite3/syncserver.go
View file

@ -97,7 +97,7 @@ func (d *SyncServerDatasource) prepare() (err error) {
}
d.Database = shared.Database{
DB: d.db,
Writer: sqlutil.NewExclusiveWriter(),
Writer: d.writer,
Invites: invites,
Peeks: peeks,
AccountData: accountData,