diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
| commit | 6828b47c459ea15d2815fe880616aa260a546838 (patch) | |
| tree | bdcc359e06bd7f7f977c976fe1d770bd708b0f55 /synapse/app/user_dir.py | |
| parent | Newsfile (diff) | |
| parent | Add `include_event_in_state` to _get_state_for_room (#6521) (diff) | |
| download | synapse-6828b47c459ea15d2815fe880616aa260a546838.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sync_asnyc
Diffstat (limited to 'synapse/app/user_dir.py')
| -rw-r--r-- | synapse/app/user_dir.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index b6d4481725..c01fb34a9b 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -43,6 +43,7 @@ from synapse.replication.tcp.streams.events import ( from synapse.rest.client.v2_alpha import user_directory from synapse.server import HomeServer from synapse.storage.data_stores.main.user_directory import UserDirectoryStore +from synapse.storage.database import Database from synapse.storage.engines import create_engine from synapse.util.caches.stream_change_cache import StreamChangeCache from synapse.util.httpresourcetree import create_resource_tree @@ -60,8 +61,8 @@ class UserDirectorySlaveStore( UserDirectoryStore, BaseSlavedStore, ): - def __init__(self, db_conn, hs): - super(UserDirectorySlaveStore, self).__init__(db_conn, hs) + def __init__(self, database: Database, db_conn, hs): + super(UserDirectorySlaveStore, self).__init__(database, db_conn, hs) events_max = self._stream_id_gen.get_current_token() curr_state_delta_prefill, min_curr_state_delta_id = self.db.get_cache_dict( |