summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-03 16:27:05 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-03 16:29:30 +0000
commit52642860dabac96467d7a7947976c53eb5dc4c82 (patch)
treefc27a43949a57b5ca4c52b9e30fa07440f587505
parentmake FederationHandler._notify_persisted_event async (diff)
downloadsynapse-52642860dabac96467d7a7947976c53eb5dc4c82.tar.xz
make FederationHandler._clean_room_for_join async
-rw-r--r--synapse/handlers/federation.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 19cd55b8cf..e252e69888 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -2883,17 +2883,17 @@ class FederationHandler(BaseHandler):
 
         await self.pusher_pool.on_new_notifications(event_stream_id, max_stream_id)
 
-    def _clean_room_for_join(self, room_id):
+    async def _clean_room_for_join(self, room_id: str) -> None:
         """Called to clean up any data in DB for a given room, ready for the
         server to join the room.
 
         Args:
-            room_id (str)
+            room_id
         """
         if self.config.worker_app:
-            return self._clean_room_for_join_client(room_id)
+            await self._clean_room_for_join_client(room_id)
         else:
-            return self.store.clean_room_for_join(room_id)
+            await self.store.clean_room_for_join(room_id)
 
     def user_joined_room(self, user, room_id):
         """Called when a new user has joined the room