diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-09 13:53:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-09 13:53:21 +0000 |
| commit | 30e9adf32f7db9aa44693876d33692bf4590d363 (patch) | |
| tree | 9b83e1dc2eeefaafe8eca4e5b95cffdf8572b346 /synapse/storage/data_stores/main/events.py | |
| parent | Merge pull request #6493 from matrix-org/erikj/invite_state_config (diff) | |
| parent | Fix comment (diff) | |
| download | synapse-30e9adf32f7db9aa44693876d33692bf4590d363.tar.xz | |
Merge pull request #6487 from matrix-org/erikj/pass_in_db
Pass in Database object to data stores.
Diffstat (limited to 'synapse/storage/data_stores/main/events.py')
| -rw-r--r-- | synapse/storage/data_stores/main/events.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/data_stores/main/events.py b/synapse/storage/data_stores/main/events.py index d644c82784..da1529f6ea 100644 --- a/synapse/storage/data_stores/main/events.py +++ b/synapse/storage/data_stores/main/events.py @@ -41,6 +41,7 @@ from synapse.storage._base import make_in_list_sql_clause from synapse.storage.data_stores.main.event_federation import EventFederationStore from synapse.storage.data_stores.main.events_worker import EventsWorkerStore from synapse.storage.data_stores.main.state import StateGroupWorkerStore +from synapse.storage.database import Database from synapse.types import RoomStreamToken, get_domain_from_id from synapse.util import batch_iter from synapse.util.caches.descriptors import cached, cachedInlineCallbacks @@ -95,8 +96,8 @@ def _retry_on_integrity_error(func): class EventsStore( StateGroupWorkerStore, EventFederationStore, EventsWorkerStore, ): - def __init__(self, db_conn, hs): - super(EventsStore, self).__init__(db_conn, hs) + def __init__(self, database: Database, db_conn, hs): + super(EventsStore, self).__init__(database, db_conn, hs) # Collect metrics on the number of forward extremities that exist. # Counter of number of extremities to count |