From 75b72db3b814448ba85fc937e11fbcaaafdda455 Mon Sep 17 00:00:00 2001
From: BarsTiger <kit.barsic@gmail.com>
Date: Thu, 27 Jul 2023 18:55:42 +0300
Subject: [PATCH] Less verbosity

---
 .../modules/server/handlers/managers/room.py         |  8 ++++----
 .../modules/server/handlers/websocket_server.py      | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dragonion_server/modules/server/handlers/managers/room.py b/dragonion_server/modules/server/handlers/managers/room.py
index b84c268..6686aa9 100644
--- a/dragonion_server/modules/server/handlers/managers/room.py
+++ b/dragonion_server/modules/server/handlers/managers/room.py
@@ -19,6 +19,8 @@ from dragonion_core.proto.web.webmessage import (
     WebConnectionResultMessage
 )
 
+from datetime import datetime
+
 
 @define
 class Room(object):
@@ -74,7 +76,7 @@ class Room(object):
         ))
 
         await self.broadcast_webmessage(connection_message)
-        print(f'Accepted {connection_message.username}')
+        print(f'[{datetime.now().time()}] Accepted {connection_message.username}')
         return connection
 
     async def broadcast_webmessage(self, obj: webmessages_union):
@@ -84,7 +86,6 @@ class Room(object):
         :return: 
         """
         for connection in self.connections.values():
-            print(f'Sending to {connection.username}: {obj}')
             await connection.send_webmessage(obj)
 
     async def broadcast_message(self, broadcastable: WebBroadcastableMessage):
@@ -173,7 +174,6 @@ class Room(object):
                 reason=close_reason
             )
         except Exception as e:
-            print(f'Cannot close {connection.username} ws, '
-                  f'maybe it\'s already closed: {e}')
+            assert e
 
         return connection.username
diff --git a/dragonion_server/modules/server/handlers/websocket_server.py b/dragonion_server/modules/server/handlers/websocket_server.py
index c472bf7..53d3646 100644
--- a/dragonion_server/modules/server/handlers/websocket_server.py
+++ b/dragonion_server/modules/server/handlers/websocket_server.py
@@ -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