diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-04 13:52:46 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-05 10:46:37 +0000 |
| commit | 756d4942f5707922f29fe1fdfd945d73a19d7ac3 (patch) | |
| tree | bbe79cc91c4da4fc830818132ba54d6974eaba0a /synapse/app | |
| parent | Merge pull request #6464 from matrix-org/erikj/make_public_sql_base (diff) | |
| download | synapse-756d4942f5707922f29fe1fdfd945d73a19d7ac3.tar.xz | |
Move DB pool and helper functions into dedicated Database class
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/_base.py | 2 | ||||
| -rw-r--r-- | synapse/app/user_dir.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py index 2ac7d5c064..9c96816096 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -269,7 +269,7 @@ def start(hs, listeners=None): # It is now safe to start your Synapse. hs.start_listening(listeners) - hs.get_datastore().start_profiling() + hs.get_datastore().db.start_profiling() setup_sentry(hs) setup_sdnotify(hs) diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index 0fa2b50999..b6d4481725 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -64,7 +64,7 @@ class UserDirectorySlaveStore( super(UserDirectorySlaveStore, self).__init__(db_conn, hs) events_max = self._stream_id_gen.get_current_token() - curr_state_delta_prefill, min_curr_state_delta_id = self.get_cache_dict( + curr_state_delta_prefill, min_curr_state_delta_id = self.db.get_cache_dict( db_conn, "current_state_delta_stream", entity_column="room_id", |