Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log (instead of raise) exceptions when running as a server extension #295

Merged
merged 4 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
5 changes: 4 additions & 1 deletion projects/jupyter-server-ydoc/jupyter_server_ydoc/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
encode_file_path,
room_id_from_encoded_path,
)
from .websocketserver import JupyterWebsocketServer, RoomNotFound
from .websocketserver import JupyterWebsocketServer, RoomNotFound, exception_logger


class YDocExtension(ExtensionApp):
Expand Down Expand Up @@ -107,6 +107,9 @@ def initialize_handlers(self):
rooms_ready=False,
auto_clean_rooms=False,
ystore_class=self.ystore_class,
# Log exceptions, because we don't want the websocket server
# to _ever_ crash permanently in a live jupyter_server.
exception_handler=exception_logger,
log=self.log,
)

Expand Down
44 changes: 40 additions & 4 deletions projects/jupyter-server-ydoc/jupyter_server_ydoc/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import json
import time
import uuid
from logging import Logger
from typing import Any

from jupyter_server.auth import authorized
Expand Down Expand Up @@ -105,6 +106,26 @@ async def prepare(self):
self._document_save_delay,
)

def exception_logger(exception: Exception, log: Logger) -> bool:
"""A function that catches any exceptions raised in the websocket
server and logs them.

The protects the y-room's task group from cancelling
anytime an exception is raised.
"""
room_id = "unknown"
if self.room.room_id:
Zsailer marked this conversation as resolved.
Show resolved Hide resolved
room_id = self.room.room_id
log.error(
f"Document Room Exception, (room_id={room_id}: ",
exc_info=exception,
)
return True

# Logging exceptions, instead of raising them here to ensure
# that the y-rooms stay alive even after an exception is seen.
self.room.exception_handler = exception_logger
Zsailer marked this conversation as resolved.
Show resolved Hide resolved

else:
# TransientRoom
# it is a transient document (e.g. awareness)
Expand Down Expand Up @@ -205,7 +226,8 @@ async def open(self, room_id):
else:
self.log.error(f"Error initializing: {file.path}\n{e!r}", exc_info=e)
self.close(
1003, f"Error initializing: {file.path}. You need to close the document."
1003,
f"Error initializing: {file.path}. You need to close the document.",
)

# Clean up the room and delete the file loader
Expand Down Expand Up @@ -272,7 +294,11 @@ async def on_message(self, message):

user = self.current_user
data = json.dumps(
{"sender": user.username, "timestamp": time.time(), "content": json.loads(msg)}
{
"sender": user.username,
"timestamp": time.time(),
"content": json.loads(msg),
}
).encode("utf8")

for client in self.room.clients:
Expand Down Expand Up @@ -387,7 +413,12 @@ async def put(self, path):
# index already exists
self.log.info("Request for Y document '%s' with room ID: %s", path, idx)
data = json.dumps(
{"format": format, "type": content_type, "fileId": idx, "sessionId": SERVER_SESSION}
{
"format": format,
"type": content_type,
"fileId": idx,
"sessionId": SERVER_SESSION,
}
)
self.set_status(200)
return self.finish(data)
Expand All @@ -401,7 +432,12 @@ async def put(self, path):
# index successfully created
self.log.info("Request for Y document '%s' with room ID: %s", path, idx)
data = json.dumps(
{"format": format, "type": content_type, "fileId": idx, "sessionId": SERVER_SESSION}
{
"format": format,
"type": content_type,
"fileId": idx,
"sessionId": SERVER_SESSION,
}
)
self.set_status(201)
return self.finish(data)
8 changes: 6 additions & 2 deletions projects/jupyter-server-ydoc/jupyter_server_ydoc/rooms.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ async def initialize(self) -> None:
if self._document.source != model["content"]:
# TODO: Delete document from the store.
self._emit(
LogLevel.INFO, "initialize", "The file is out-of-sync with the ystore."
LogLevel.INFO,
"initialize",
"The file is out-of-sync with the ystore.",
)
self.log.info(
"Content in file %s is out-of-sync with the ystore %s",
Expand All @@ -135,7 +137,9 @@ async def initialize(self) -> None:
if read_from_source:
self._emit(LogLevel.INFO, "load", "Content loaded from disk.")
self.log.info(
"Content in room %s loaded from file %s", self._room_id, self._file.path
"Content in room %s loaded from file %s",
self._room_id,
self._file.path,
)
self._document.source = model["content"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import asyncio
from logging import Logger
from typing import Any
from typing import Any, Callable

from pycrdt_websocket.websocket_server import WebsocketServer, YRoom
from pycrdt_websocket.ystore import BaseYStore
Expand All @@ -16,6 +16,17 @@ class RoomNotFound(LookupError):
pass


def exception_logger(exception: Exception, log: Logger) -> bool:
"""A function that catches any exceptions raised in the websocket
server and logs them.

The protects the websocket server's task group from cancelling
Zsailer marked this conversation as resolved.
Show resolved Hide resolved
anytime an exception is raised.
"""
log.error("Jupyter Websocket Server: ", exc_info=exception)
return True


class JupyterWebsocketServer(WebsocketServer):
"""Ypy websocket server.

Expand All @@ -30,9 +41,15 @@ def __init__(
ystore_class: BaseYStore,
rooms_ready: bool = True,
auto_clean_rooms: bool = True,
exception_handler: Callable[[Exception, Logger], bool] | None = None,
log: Logger | None = None,
):
super().__init__(rooms_ready, auto_clean_rooms, log)
super().__init__(
rooms_ready=rooms_ready,
auto_clean_rooms=auto_clean_rooms,
exception_handler=exception_handler,
log=log,
)
self.ystore_class = ystore_class
self.ypatch_nb = 0
self.connected_users: dict[Any, Any] = {}
Expand Down
2 changes: 1 addition & 1 deletion projects/jupyter-server-ydoc/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ authors = [
dependencies = [
"jupyter_server>=2.4.0,<3.0.0",
"jupyter_ydoc>=2.0.0,<3.0.0",
"pycrdt-websocket>=0.13.0,<0.14.0",
"pycrdt-websocket>=0.13.1,<0.14.0",
"jupyter_events>=0.10.0",
"jupyter_server_fileid>=0.7.0,<1",
"jsonschema>=4.18.0"
Expand Down
Loading