From bb2c58fb407a3783b3704b33df6a154207ae4199 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 13 三月 2024 14:39:05 +0800
Subject: [PATCH] 更改L2数据接收方式

---
 l2/l2_data_listen_manager.py |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/l2/l2_data_listen_manager.py b/l2/l2_data_listen_manager.py
index e3be39a..e3e2bc2 100644
--- a/l2/l2_data_listen_manager.py
+++ b/l2/l2_data_listen_manager.py
@@ -114,7 +114,8 @@
         count = 0
         while True:
             try:
-                data = socket.recv_json()
+                data = socket.recv()
+                data = marshal.loads(data)
                 self.my_l2_data_callback.OnL2Order(data[0], data[1], data[2])
                 socket.send_string("SUCCESS")
             except Exception as e:
@@ -132,18 +133,18 @@
             threading.Thread(target=lambda: self.__create_ipc_server(host), daemon=True).start()
 
     # 鎺ユ敹L2鏁版嵁
-    def receive_l2_data(self, order_queues, transaction_queues, market_queue):
+    def receive_l2_data(self, order_queues, transaction_queues, market_queue, order_ipc_hosts):
         # TODO 鏆傛椂涓嶉�氳繃闃熷垪鎺ユ敹鏁版嵁
-        for q in order_queues:
-            t1 = threading.Thread(target=lambda: self.__recive_l2_orders(q), daemon=True)
-            t1.start()
+        # for q in order_queues:
+        #     t1 = threading.Thread(target=lambda: self.__recive_l2_orders(q), daemon=True)
+        #     t1.start()
         for q in transaction_queues:
             t2 = threading.Thread(target=lambda: self.__recive_transaction_orders(q), daemon=True)
             t2.start()
         t3 = threading.Thread(target=lambda: self.__recive_l2_markets(market_queue), daemon=True)
         t3.start()
         # 鎺ユ敹璁㈠崟hosts
-        # self.__create_ipc_server_hosts(order_ipc_hosts)
+        self.__create_ipc_server_hosts(order_ipc_hosts)
 
     def get_active_count(self, type_):
         expire_time = time.time() - 5

--
Gitblit v1.8.0