diff options
| author | Erik Johnston <erik@matrix.org> | 2020-08-05 21:38:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 21:38:57 +0100 |
| commit | a7bdf98d01d2225a479753a85ba81adf02b16a32 (patch) | |
| tree | 11443d9f4d89d9cd33d34d4146fd62e6393a87c6 /synapse/rest | |
| parent | Stop the parent process flushing the logs on exit (#8012) (diff) | |
| download | synapse-a7bdf98d01d2225a479753a85ba81adf02b16a32.tar.xz | |
Rename database classes to make some sense (#8033)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/admin/rooms.py | 2 | ||||
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py index a8364d9793..7c292ef3f9 100644 --- a/synapse/rest/admin/rooms.py +++ b/synapse/rest/admin/rooms.py @@ -31,7 +31,7 @@ from synapse.rest.admin._base import ( assert_user_is_admin, historical_admin_path_patterns, ) -from synapse.storage.data_stores.main.room import RoomSortOrder +from synapse.storage.databases.main.room import RoomSortOrder from synapse.types import RoomAlias, RoomID, UserID, create_requester logger = logging.getLogger(__name__) diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index e12f65a206..f4768a9e8b 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -586,7 +586,7 @@ class PreviewUrlResource(DirectServeJsonResource): logger.debug("Running url preview cache expiry") - if not (await self.store.db.updates.has_completed_background_updates()): + if not (await self.store.db_pool.updates.has_completed_background_updates()): logger.info("Still running DB updates; skipping expiry") return |