Fixed the websocket
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import logging.config
|
import logging.config
|
||||||
import math
|
import math
|
||||||
# import json
|
import json
|
||||||
import app.telegram.keyboards.inline as kbi
|
import app.telegram.keyboards.inline as kbi
|
||||||
import database.request as rq
|
import database.request as rq
|
||||||
from app.bybit.get_functions.get_instruments_info import get_instruments_info
|
from app.bybit.get_functions.get_instruments_info import get_instruments_info
|
||||||
@@ -373,5 +373,7 @@ class TelegramMessageHandler:
|
|||||||
)
|
)
|
||||||
logger.info("Stop trading for symbol: %s, create_type: %s, stop_order_type: %s: %s",
|
logger.info("Stop trading for symbol: %s, create_type: %s, stop_order_type: %s: %s",
|
||||||
symbol, create_type, stop_order_type, tg_id)
|
symbol, create_type, stop_order_type, tg_id)
|
||||||
|
else:
|
||||||
|
logger.info("Execution update: %s", json.dumps(message))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Error in telegram_message_handler: %s", e, exc_info=True)
|
logger.error("Error in telegram_message_handler: %s", e, exc_info=True)
|
||||||
|
|||||||
@@ -11,6 +11,13 @@ logging.config.dictConfig(LOGGING_CONFIG)
|
|||||||
logger = logging.getLogger("web_socket")
|
logger = logging.getLogger("web_socket")
|
||||||
|
|
||||||
|
|
||||||
|
class CustomWebSocket(WebSocket):
|
||||||
|
def _on_error(self, error):
|
||||||
|
logger.error(f"WebSocket error: {error}")
|
||||||
|
# Здесь можно добавить собственную логику, например уведомления, метрики и т.д.
|
||||||
|
return super()._on_error(error)
|
||||||
|
|
||||||
|
|
||||||
class WebSocketBot:
|
class WebSocketBot:
|
||||||
"""
|
"""
|
||||||
Class to handle WebSocket connections and messages.
|
Class to handle WebSocket connections and messages.
|
||||||
@@ -43,9 +50,9 @@ class WebSocketBot:
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
if tg_id in self.user_sockets:
|
if tg_id in self.user_sockets:
|
||||||
self.user_sockets.clear()
|
self.user_sockets.pop(tg_id, None)
|
||||||
self.user_messages.clear()
|
self.user_messages.pop(tg_id, None)
|
||||||
self.user_keys.clear()
|
self.user_keys.pop(tg_id, None)
|
||||||
logger.info(
|
logger.info(
|
||||||
"Closed old websocket for user %s due to key change", tg_id
|
"Closed old websocket for user %s due to key change", tg_id
|
||||||
)
|
)
|
||||||
@@ -73,12 +80,13 @@ class WebSocketBot:
|
|||||||
async def try_connect_user(self, api_key, api_secret, tg_id):
|
async def try_connect_user(self, api_key, api_secret, tg_id):
|
||||||
"""Try to connect a user to the WebSocket."""
|
"""Try to connect a user to the WebSocket."""
|
||||||
try:
|
try:
|
||||||
self.ws_private = WebSocket(
|
self.ws_private = CustomWebSocket(
|
||||||
demo=True,
|
demo=True,
|
||||||
testnet=False,
|
testnet=False,
|
||||||
channel_type="private",
|
channel_type="private",
|
||||||
api_key=api_key,
|
api_key=api_key,
|
||||||
api_secret=api_secret,
|
api_secret=api_secret,
|
||||||
|
ping_interval=20,
|
||||||
)
|
)
|
||||||
|
|
||||||
self.user_sockets[tg_id] = self.ws_private
|
self.user_sockets[tg_id] = self.ws_private
|
||||||
@@ -98,7 +106,7 @@ class WebSocketBot:
|
|||||||
return True
|
return True
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Error connecting user %s: %s", tg_id, e)
|
logger.error("Error connecting user %s: %s", tg_id, e)
|
||||||
return False
|
await asyncio.sleep(5)
|
||||||
|
|
||||||
async def handle_order_update(self, message, tg_id):
|
async def handle_order_update(self, message, tg_id):
|
||||||
"""Handle order updates."""
|
"""Handle order updates."""
|
||||||
|
|||||||
Reference in New Issue
Block a user