diff options
| author | Erik Johnston <erik@matrix.org> | 2022-06-01 16:02:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-01 16:02:53 +0100 |
| commit | 888a29f4127723a8d048ce47cff37ee8a7a6f1b9 (patch) | |
| tree | 891ae4c95632801bb097aaed8aea5d8b541c5cf7 /synapse/federation | |
| parent | Fix complement tests using the wrong path (#12933) (diff) | |
| download | synapse-888a29f4127723a8d048ce47cff37ee8a7a6f1b9.tar.xz | |
Wait for lazy join to complete when getting current state (#12872)
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 12591dc8db..f4af121c4d 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -118,6 +118,8 @@ class FederationServer(FederationBase): self.state = hs.get_state_handler() self._event_auth_handler = hs.get_event_auth_handler() + self._state_storage_controller = hs.get_storage_controllers().state + self.device_handler = hs.get_device_handler() # Ensure the following handlers are loaded since they register callbacks @@ -1221,7 +1223,7 @@ class FederationServer(FederationBase): Raises: AuthError if the server does not match the ACL """ - state_ids = await self.store.get_current_state_ids(room_id) + state_ids = await self._state_storage_controller.get_current_state_ids(room_id) acl_event_id = state_ids.get((EventTypes.ServerACL, "")) if not acl_event_id: |