From 1ff185866bcf0796d2367699bc000abb326360d5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 15 九月 2023 17:02:51 +0800
Subject: [PATCH] 交易设置独立进程/删除trade_client_server/记录L2逐笔委托日志

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

diff --git a/main.py b/main.py
index edfd9b0..1920699 100644
--- a/main.py
+++ b/main.py
@@ -49,12 +49,7 @@
     t1.start()
     #
     # 鍚姩鍗庨懌浜ゆ槗鏈嶅姟
-    t1 = threading.Thread(
-        target=lambda: trade_server.run(pipe_trade, pipe_l1, pipe_l2, huaxin_client.trade_client.process_cmd),
-        name="trade_server", daemon=True)
-    t1.start()
-
-    huaxin_client.trade_client.run(trade_server.my_trade_response, ptl2_trade, pst_trade)
+    trade_server.run(pipe_trade, pipe_l1, pipe_l2, huaxin_client.trade_client.process_cmd)
 
 
 # 涓绘湇鍔�
@@ -107,11 +102,17 @@
         l1Process = multiprocessing.Process(target=huaxin_client.l1_client.run, args=(pl1t_l1,))
         l1Process.start()
 
+        # 浜ゆ槗杩涚▼
+        tradeProcess = multiprocessing.Process(
+            target=lambda: huaxin_client.trade_client.run(None, ptl2_trade, pst_trade))
+        tradeProcess.start()
+
         # 涓昏繘绋�
         createTradeServer(pss_strategy, pst_strategy, pl1t_strategy, psl2_strategy, ptl2_l2, psl2_l2, ptl2_trade,
                           pst_trade)
 
         # 灏唗radeServer浣滀负涓昏繘绋�
         l1Process.join()
+        tradeProcess.join()
     except Exception as e:
         logger_system.exception(e)

--
Gitblit v1.8.0