Skip to content

[bugfix] prevent crash when no user id is found #1349

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 6, 2020
Merged

[bugfix] prevent crash when no user id is found #1349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions services/web/server/src/simcore_service_webserver/socketio/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@
from typing import Dict, List, Optional

from aiohttp import web
from servicelib.observer import observe
from socketio.exceptions import \
ConnectionRefusedError as socket_io_connection_error

from servicelib.observer import observe

from ..login.decorators import RQT_USERID_KEY, login_required
from ..resource_manager.websocket_manager import managed_resource
from .config import get_socket_server
Expand Down Expand Up @@ -106,8 +105,12 @@ async def disconnect(sid: str, app: web.Application) -> None:
log.debug("client in room %s disconnecting", sid)
sio = get_socket_server(app)
async with sio.session(sid) as socketio_session:
user_id = socketio_session["user_id"]
client_session_id = socketio_session["client_session_id"]
with managed_resource(user_id, client_session_id, app) as rt:
log.debug("client %s disconnected from room %s", user_id, sid)
await rt.remove_socket_id()
if "user_id" in socketio_session:
user_id = socketio_session["user_id"]
client_session_id = socketio_session["client_session_id"]
with managed_resource(user_id, client_session_id, app) as rt:
log.debug("client %s disconnected from room %s", user_id, sid)
await rt.remove_socket_id()
else:
# this should not happen!!
log.error("Unknown client diconnected sid: %s, session %s", sid, str(socketio_session))