From ca186ff9fe0be665ba1153b7244a671bdade6f23 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 19 九月 2023 15:01:05 +0800
Subject: [PATCH] BUG修复
---
main.py | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/main.py b/main.py
index 1920699..902cdfe 100644
--- a/main.py
+++ b/main.py
@@ -23,7 +23,7 @@
# from huaxin_api import trade_client, l2_client, l1_client
-def createTradeServer(pipe_server, pipe_trade, pipe_l1, pipe_l2, ptl2_l2, psl2_l2, ptl2_trade, pst_trade):
+def createTradeServer(pipe_server, pipe_trade, pipe_l1, pipe_l2, ptl2_l2, psl2_l2, queue_strategy_trade):
logger_system.info("绛栫暐杩涚▼ID锛歿}", os.getpid())
log.close_print()
# 鍒濆鍖栧弬鏁�
@@ -49,7 +49,7 @@
t1.start()
#
# 鍚姩鍗庨懌浜ゆ槗鏈嶅姟
- trade_server.run(pipe_trade, pipe_l1, pipe_l2, huaxin_client.trade_client.process_cmd)
+ trade_server.run(pipe_trade, pipe_l1, pipe_l2, queue_strategy_trade)
# 涓绘湇鍔�
@@ -93,6 +93,8 @@
# l1涓庣瓥鐣ラ棿鐨勯�氫俊
pl1t_l1, pl1t_strategy = multiprocessing.Pipe()
+ queue_strategy_trade = multiprocessing.Queue()
+
# 鎵樼鐜涓嬩笉鍒涘缓
# serverProcess = multiprocessing.Process(target=createServer, args=(pss_server,))
# serverProcess.start()
@@ -104,12 +106,11 @@
# 浜ゆ槗杩涚▼
tradeProcess = multiprocessing.Process(
- target=lambda: huaxin_client.trade_client.run(None, ptl2_trade, pst_trade))
+ target=lambda: huaxin_client.trade_client.run(None, ptl2_trade, pst_trade, queue_strategy_trade))
tradeProcess.start()
# 涓昏繘绋�
- createTradeServer(pss_strategy, pst_strategy, pl1t_strategy, psl2_strategy, ptl2_l2, psl2_l2, ptl2_trade,
- pst_trade)
+ createTradeServer(pss_strategy, pst_strategy, pl1t_strategy, psl2_strategy, ptl2_l2, psl2_l2, queue_strategy_trade)
# 灏唗radeServer浣滀负涓昏繘绋�
l1Process.join()
--
Gitblit v1.8.0