fix-cleanup-logic-and-suppress-logs (#475)

Author: Darshan808

projects/jupyter-server-ydoc/jupyter_server_ydoc/handlers.py

@@ -259,7 +259,7 @@ async def open(self, room_id):
                     )
 
                 # Clean up the room and delete the file loader
-                if len(self.room.clients) == 0 or self.room.clients == [self]:
+                if len(self.room.clients) == 0 or self.room.clients == {self}:
                     self._message_queue.put_nowait(b"")
                     self._cleanup_delay = 0
                     await self._clean_room()
@@ -321,7 +321,7 @@ def on_close(self) -> None:
         """
         # stop serving this client
         self._message_queue.put_nowait(b"")
-        if isinstance(self.room, DocumentRoom) and self.room.clients == [self]:
+        if isinstance(self.room, DocumentRoom) and self.room.clients == {self}:
             # no client in this room after we disconnect
             # keep the document for a while in case someone reconnects
             self.log.info("Cleaning room: %s", self._room_id)

projects/jupyter-server-ydoc/jupyter_server_ydoc/loaders.py

@@ -203,13 +203,28 @@ async def _watch_file(self) -> None:
         if self._poll_interval is None:
             return
 
+        consecutive_error_logs = 0
+        max_consecutive_logs = 3
+        suppression_logged = False
+
         while True:
             try:
                 await asyncio.sleep(self._poll_interval)
                 try:
                     await self.maybe_notify()
+                    consecutive_error_logs = 0
+                    suppression_logged = False
                 except Exception as e:
-                    self._log.error(f"Error watching file: {self.path}\n{e!r}", exc_info=e)
+                    if consecutive_error_logs < max_consecutive_logs:
+                        self._log.error(f"Error watching file: {self.path}\n{e!r}", exc_info=e)
+                        consecutive_error_logs += 1
+                    elif not suppression_logged:
+                        self._log.warning(
+                            "Too many errors while watching %s — suppressing further logs.",
+                            self.path,
+                        )
+                        suppression_logged = True
+
             except asyncio.CancelledError:
                 break