diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-05 10:43:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 10:43:49 +0000 |
| commit | ddbbfc9512cd9b66d3af57ab5e9fb1e5a0418913 (patch) | |
| tree | eb061c5e86be7baf9428161715637a0f12bb2ff3 /synapse/app | |
| parent | Merge pull request #6470 from matrix-org/babolivier/port_db_ci_failure (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-ddbbfc9512cd9b66d3af57ab5e9fb1e5a0418913.tar.xz | |
Merge pull request #6464 from matrix-org/erikj/make_public_sql_base
Clean up SQLBaseStore private function usage
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/homeserver.py | 4 | ||||
| -rw-r--r-- | synapse/app/user_dir.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 883b3fb70b..267aebaae9 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -542,8 +542,8 @@ def phone_stats_home(hs, stats, stats_process=_stats_process): # Database version # - stats["database_engine"] = hs.get_datastore().database_engine_name - stats["database_server_version"] = hs.get_datastore().get_server_version() + stats["database_engine"] = hs.database_engine.module.__name__ + stats["database_server_version"] = hs.database_engine.server_version logger.info("Reporting stats to %s: %s" % (hs.config.report_stats_endpoint, stats)) try: yield hs.get_proxied_http_client().put_json( diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index 6cb100319f..0fa2b50999 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.get_cache_dict( db_conn, "current_state_delta_stream", entity_column="room_id", |