summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-20 16:52:28 +0000
committerErik Johnston <erik@matrix.org>2019-03-20 16:52:28 +0000
commit6b28890543cfd128a05c3e05ad53ea1e36c932fa (patch)
tree07ecd9a6875caa05bfb156c950ec092ce06d6435 /synapse/rest/client
parentOnly require consent for events with an associated request (diff)
downloadsynapse-6b28890543cfd128a05c3e05ad53ea1e36c932fa.tar.xz
Log new room ID
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v1/admin.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py
index 2a29f0c2af..56c253cc9d 100644
--- a/synapse/rest/client/v1/admin.py
+++ b/synapse/rest/client/v1/admin.py
@@ -490,8 +490,13 @@ class ShutdownRoomRestServlet(ClientV1RestServlet):
 
         requester_user_id = requester.user.to_string()
 
-        logger.info("Shutting down room %r", room_id)
+        logger.info(
+            "Shutting down room %r, joining to new room: %r",
+            room_id, new_room_id,
+        )
 
+        # This will work even if the room is already blocked, but that is
+        # desirable in case the first attempt at blocking the room failed below.
         yield self.store.block_room(room_id, requester_user_id)
 
         users = yield self.state.get_current_user_in_room(room_id)