diff options
author | Erik Johnston <erik@matrix.org> | 2019-12-06 13:08:40 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-12-06 13:30:06 +0000 |
commit | 9a4fb457cf5918c85068ea249cd2d58b3e2e3cfc (patch) | |
tree | 4bb85c953cb523732bcc53ec01b7c1f8209ac1ad /synapse/replication/slave/storage/events.py | |
parent | Merge pull request #6469 from matrix-org/erikj/make_database_class (diff) | |
download | synapse-9a4fb457cf5918c85068ea249cd2d58b3e2e3cfc.tar.xz |
Change DataStores to accept 'database' param.
Diffstat (limited to 'synapse/replication/slave/storage/events.py')
-rw-r--r-- | synapse/replication/slave/storage/events.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index d0a0eaf75b..29f35b9915 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -31,6 +31,7 @@ from synapse.storage.data_stores.main.signatures import SignatureWorkerStore from synapse.storage.data_stores.main.state import StateGroupWorkerStore from synapse.storage.data_stores.main.stream import StreamWorkerStore from synapse.storage.data_stores.main.user_erasure_store import UserErasureWorkerStore +from synapse.storage.database import Database from ._base import BaseSlavedStore from ._slaved_id_tracker import SlavedIdTracker @@ -59,13 +60,13 @@ class SlavedEventStore( RelationsWorkerStore, BaseSlavedStore, ): - def __init__(self, db_conn, hs): + def __init__(self, database: Database, db_conn, hs): self._stream_id_gen = SlavedIdTracker(db_conn, "events", "stream_ordering") self._backfill_id_gen = SlavedIdTracker( db_conn, "events", "stream_ordering", step=-1 ) - super(SlavedEventStore, self).__init__(db_conn, hs) + super(SlavedEventStore, self).__init__(database, db_conn, hs) # Cached functions can't be accessed through a class instance so we need # to reach inside the __dict__ to extract them. |