Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions jupyter_server_documents/rooms/yroom_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def has_room(self, room_id: str) -> bool:
return room_id in self._rooms_by_id


def delete_room(self, room_id: str) -> None:
def delete_room(self, room_id: str) -> bool:
"""
Gracefully deletes a YRoom given a room ID. This stops the YRoom,
closing all Websockets with close code 1001 (server shutting down),
Expand All @@ -169,17 +169,17 @@ def delete_room(self, room_id: str) -> None:
"""
yroom = self._rooms_by_id.pop(room_id, None)
if not yroom:
return None
return True

self.log.info(f"Stopping YRoom '{room_id}'.")
try:
yroom.stop()
return None
return True
except Exception as e:
self.log.exception(
f"Exception raised when stopping YRoom '{room_id}: "
)
return None
return False


async def _watch_rooms(self) -> None:
Expand Down Expand Up @@ -286,10 +286,10 @@ async def stop(self) -> None:
deletion_tasks = []

# Define task that deletes the room and waits until the content is saved
async def delete_then_save(room_id: str, room: YRoom):
self.delete_room(room_id)
async def delete_then_save(room_id: str, room: YRoom) -> bool:
result = self.delete_room(room_id)
await room.until_saved
return None
return result

# Delete all rooms concurrently using `delete_then_save()`
for room_id, room in self._rooms_by_id.items():
Expand Down
Loading