aboutsummaryrefslogtreecommitdiff
path: root/roomserver/storage/sqlite3/storage.go
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-10-20 19:32:33 +0100
committerGitHub <noreply@github.com>2020-10-20 19:32:33 +0100
commit6b8791b8688991ad04e8231af3838aa090c6bd52 (patch)
tree92f1d85d8adc05b7c7617b9c8432f2ab4422febd /roomserver/storage/sqlite3/storage.go
parent7612f64e3c177b388420699f3fec4ecb563b66ee (diff)
Always call overridden form of GetLatestEventsForUpdate (#1554)
This ensures we don't make txns on sqlite still, which can cause 'database is locked' errors.
Diffstat (limited to 'roomserver/storage/sqlite3/storage.go')
-rw-r--r--roomserver/storage/sqlite3/storage.go35
1 files changed, 18 insertions, 17 deletions
diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go
index 4a74bf73..6d9b860f 100644
--- a/roomserver/storage/sqlite3/storage.go
+++ b/roomserver/storage/sqlite3/storage.go
@@ -120,23 +120,24 @@ func Open(dbProperties *config.DatabaseOptions, cache caching.RoomServerCaches)
return nil, err
}
d.Database = shared.Database{
- DB: d.db,
- Cache: cache,
- Writer: d.writer,
- EventsTable: d.events,
- EventTypesTable: d.eventTypes,
- EventStateKeysTable: d.eventStateKeys,
- EventJSONTable: d.eventJSON,
- RoomsTable: d.rooms,
- TransactionsTable: d.transactions,
- StateBlockTable: stateBlock,
- StateSnapshotTable: stateSnapshot,
- PrevEventsTable: d.prevEvents,
- RoomAliasesTable: roomAliases,
- InvitesTable: d.invites,
- MembershipTable: d.membership,
- PublishedTable: published,
- RedactionsTable: redactions,
+ DB: d.db,
+ Cache: cache,
+ Writer: d.writer,
+ EventsTable: d.events,
+ EventTypesTable: d.eventTypes,
+ EventStateKeysTable: d.eventStateKeys,
+ EventJSONTable: d.eventJSON,
+ RoomsTable: d.rooms,
+ TransactionsTable: d.transactions,
+ StateBlockTable: stateBlock,
+ StateSnapshotTable: stateSnapshot,
+ PrevEventsTable: d.prevEvents,
+ RoomAliasesTable: roomAliases,
+ InvitesTable: d.invites,
+ MembershipTable: d.membership,
+ PublishedTable: published,
+ RedactionsTable: redactions,
+ GetLatestEventsForUpdateFn: d.GetLatestEventsForUpdate,
}
return &d, nil
}