From dfdca3f9e04afd2046bcbabfd0ed12750b44c0e1 Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Fri, 9 Jun 2023 14:59:14 +0200 Subject: Apply suggestions from code review Co-authored-by: Eric Eastwood --- synapse/handlers/pagination.py | 6 +++--- synapse/handlers/room.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 0a885a981e..597f087a28 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -184,8 +184,8 @@ class PaginationHandler: self._delete_by_id[delete_id].status = status self._delete_by_room.setdefault(room_id, []).append(delete_id) - # restore a shutdown from the DB - # also take care of purging if needed + # If the database says we were last in the middle of shutting down the room, + # let's continue the shutdown process. shutdown_response = None if status == DeleteStatus.STATUS_SHUTTING_DOWN: shutdown_params = json.loads(r["shutdown_params"]) @@ -683,7 +683,7 @@ class PaginationHandler: shutdown_params: parameters for the shutdown, cf `RoomShutdownHandler.ShutdownRoomParams` shutdown_response: current status of the shutdown, if it was interrupted - Saves a `RoomShutdownHandler.ShutdownRoomResponse` in `DeleteStatus` and in DB + Keeps track of the `DeleteStatus` (and `ShutdownRoomResponse`) in `self._delete_by_id` and persisted in DB """ self._purges_in_progress_by_room.add(room_id) diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index b7ebc0610b..f70eb15cff 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -1730,7 +1730,7 @@ class ShutdownRoomParams(TypedDict): If set to `true`, purge the given room from the database. force_purge: If set to `true`, the room will be purged from database - also if it fails to remove some users from room. + even if there are still users joined to the room. """ requester_user_id: str -- cgit 1.5.1