From c4861d2429c2bf3a3f11309ad879b549e62e722d Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 26 四月 2024 15:26:52 +0800
Subject: [PATCH] 下单/撤单通信方式修改/G撤修改
---
main.py | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/main.py b/main.py
index f8ff4b5..f11e36b 100644
--- a/main.py
+++ b/main.py
@@ -28,7 +28,20 @@
def createTradeServer(pipe_server, queue_strategy_r_trade_w_: multiprocessing.Queue,
queue_l1_w_strategy_r_: multiprocessing.Queue,
queue_strategy_w_trade_r_: multiprocessing.Queue,
- queue_strategy_w_trade_r_for_read_: multiprocessing.Queue, queue_l1_trade_r_strategy_w_, queue_l1_trade_w_strategy_r_):
+ queue_strategy_w_trade_r_for_read_: multiprocessing.Queue, queue_l1_trade_r_strategy_w_,
+ queue_l1_trade_w_strategy_r_, trade_ipc_addr):
+ """
+ 绛栫暐杩涚▼
+ @param pipe_server:
+ @param queue_strategy_r_trade_w_:
+ @param queue_l1_w_strategy_r_:
+ @param queue_strategy_w_trade_r_:
+ @param queue_strategy_w_trade_r_for_read_:
+ @param queue_l1_trade_r_strategy_w_:
+ @param queue_l1_trade_w_strategy_r_:
+ @param trade_ipc_addr: 浜ゆ槗ipc鍦板潃(涓嬪崟鍦板潃, 鎾ゅ崟鍦板潃)
+ @return:
+ """
logger_system.info("绛栫暐杩涚▼ID锛歿}", os.getpid())
log.close_print()
# 鍒濆鍖栧弬鏁�
@@ -51,7 +64,7 @@
# 鍚姩鍗庨懌浜ゆ槗鏈嶅姟
huaxin_trade_server.run(queue_strategy_r_trade_w_, queue_l1_w_strategy_r_, queue_strategy_w_trade_r_,
queue_strategy_w_trade_r_for_read_,
- queue_l1_trade_w_strategy_r_)
+ queue_l1_trade_w_strategy_r_, trade_ipc_addr)
# 涓绘湇鍔�
@@ -105,6 +118,9 @@
# 绛栫暐璇讳氦鏄撳啓
queue_strategy_r_trade_w = multiprocessing.Queue()
+ # 涓嬪崟,鎾ゅ崟ipc鍦板潃
+ order_ipc_addr, cancel_order_ipc_addr = "ipc://trade_order.ipc", "ipc://trade_cancel_order.ipc"
+
# 鎵樼鐜涓嬩笉鍒涘缓
# serverProcess = multiprocessing.Process(target=createServer, args=(pss_server,))
# serverProcess.start()
@@ -122,7 +138,7 @@
# 浜ゆ槗杩涚▼
tradeProcess = multiprocessing.Process(
target=huaxin_client.trade_client.run,
- args=(None, queue_other_w_l2_r, queue_strategy_r_trade_w, queue_strategy_w_trade_r,
+ args=(order_ipc_addr, cancel_order_ipc_addr, queue_strategy_r_trade_w, queue_strategy_w_trade_r,
queue_strategy_w_trade_r_for_read))
tradeProcess.start()
# 姝ゅ灏哃2鐨勮繘绋嬩笌绛栫暐杩涚▼鍚堝苟
@@ -138,7 +154,7 @@
# 涓昏繘绋�
createTradeServer(pss_strategy, queue_strategy_r_trade_w, queue_l1_w_strategy_r, queue_strategy_w_trade_r,
queue_strategy_w_trade_r_for_read, queue_l1_trade_r_strategy_w,
- queue_l1_trade_w_strategy_r)
+ queue_l1_trade_w_strategy_r,trade_ipc_addr)
# 灏唗radeServer浣滀负涓昏繘绋�
l1Process.join()
--
Gitblit v1.8.0