dragonion/dragonion-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Less verbosity

Browse Source
This commit is contained in:
BarsTiger
2023-07-27 18:55:42 +03:00
parent 3be0f6409d
commit 75b72db3b8
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dragonion_server/modules/server/handlers/websocket_server.py
View File

@@ -6,6 +6,7 @@ from dragonion_core.proto.web.webmessage import (
)
from .managers.exceptions import GotInvalidWebmessage
from datetime import datetime
service = Service()
@@ -17,7 +18,7 @@ async def serve_websocket(websocket: WebSocket, room_name: str):
:param room_name: Room name to connect ws to
:return:
"""
print(f'Connection opened room {room_name}')
print(f'[{datetime.now().time()}] Connection opened room {room_name}')
room = await service.get_room(room_name)
connection = await room.accept_connection(websocket)
@@ -28,7 +29,6 @@ async def serve_websocket(websocket: WebSocket, room_name: str):
try:
webmessage: webmessages_union = WebMessage.from_json(data)
except Exception as e:
print(f"Cannot decode message, {e}")
await connection.send_error("invalid_webmessage")
continue
@@ -40,21 +40,21 @@ async def serve_websocket(websocket: WebSocket, room_name: str):
await room.broadcast_message(webmessage)
except GotInvalidWebmessage:
print('Invalid webmsg')
await connection.send_error("invalid_webmessage")
except RuntimeError:
username = await room.disconnect(connection)
if username is not None:
await room.broadcast_user_disconnected(username)
print(f'Closed {username}')
print(f'[{datetime.now().time()}] Closed {username}')
break
except WebSocketDisconnect:
username = await room.disconnect(connection)
if username is not None:
await room.broadcast_user_disconnected(username)
print(f'Closed {username}')
print(f'[{datetime.now().time()}] Closed {username}')
break
except Exception as e:
print(f'Exception in {connection.username}: {e.__class__}: {e}')
print(f'[{datetime.now().time()}] Exception in '
f'{connection.username}: {e.__class__}: {e}')
continue