From 457f3d4ca0c33ea41055de2e45c4218e3f541d02 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 15 八月 2023 14:02:38 +0800
Subject: [PATCH] ++++++++++++++++ bug修复-
---
main.py | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/main.py b/main.py
index 33e142b..43eefe6 100644
--- a/main.py
+++ b/main.py
@@ -19,7 +19,7 @@
# from huaxin_api import trade_client, l2_client, l1_client
-def createTradeServer(pipe_server, pipe_trade, pipe_l1):
+def createTradeServer(pipe_server, pipe_trade, pipe_l1, pipe_l2):
# 鍒濆鍖栧弬鏁�
global_data_loader.init()
@@ -28,7 +28,7 @@
t1.start()
# 浜ゆ槗鎺ュ彛鏈嶅姟
- t1 = threading.Thread(target=trade_api_server.run, args=(pipe_server,), daemon=True)
+ t1 = threading.Thread(target=trade_api_server.run, args=(pipe_server, pipe_l2), daemon=True)
t1.start()
# redis鍚庡彴鏈嶅姟
@@ -61,21 +61,22 @@
pst_trade, pst_strategy = multiprocessing.Pipe()
# 浜ゆ槗涓巐2涔嬮棿鐨勯�氫俊
ptl2_trade, ptl2_l2 = multiprocessing.Pipe()
- # l1涓巘rade闂寸殑閫氫俊
- pl1t_l1, pl1t_trade = multiprocessing.Pipe()
+ # 绛栫暐涓巐2涔嬮棿鐨勯�氫俊
+ psl2_strategy, psl2_l2 = multiprocessing.Pipe()
+
+ # l1涓庣瓥鐣ラ棿鐨勯�氫俊
+ pl1t_l1, pl1t_strategy = multiprocessing.Pipe()
serverProcess = multiprocessing.Process(target=createServer, args=(pss_server,))
serverProcess.start()
- tradeServerProcess = multiprocessing.Process(target=createTradeServer, args=(pss_strategy, pst_strategy, pl1t_trade,))
+ tradeServerProcess = multiprocessing.Process(target=createTradeServer,
+ args=(pss_strategy, pst_strategy, pl1t_strategy, psl2_strategy))
tradeServerProcess.start()
-
- # 绛夊緟鏈嶅姟鍣ㄥ惎鍔�
- time.sleep(10)
# 浜ゆ槗杩涚▼涓嶭2杩涚▼
tradeProcess = multiprocessing.Process(target=huaxin_api.trade_client.run, args=(ptl2_trade, pst_trade))
- l2Process = multiprocessing.Process(target=huaxin_api.l2_client.run, args=(ptl2_l2,))
+ l2Process = multiprocessing.Process(target=huaxin_api.l2_client.run, args=(ptl2_l2, psl2_l2,))
tradeProcess.start()
l2Process.start()
# L1璁㈤槄鏁版嵁
--
Gitblit v1.8.0