From c0bcfe746b97bc126636a658b1f01fc6a51f9f95 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 25 九月 2023 17:55:33 +0800
Subject: [PATCH] 将华鑫订单交易成功独立出来处理
---
main.py | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/main.py b/main.py
index 4984570..dbffea5 100644
--- a/main.py
+++ b/main.py
@@ -4,7 +4,6 @@
import multiprocessing
import os
-import sys
from db import redis_manager_delegate as redis_manager
import huaxin_client.trade_client
@@ -23,7 +22,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, queue_strategy_trade):
+def createTradeServer(pipe_server, queue_strategy_r_trade_w, pipe_l1, pipe_l2, ptl2_l2, psl2_l2, queue_strategy_w_trade_r):
logger_system.info("绛栫暐杩涚▼ID锛歿}", os.getpid())
log.close_print()
# 鍒濆鍖栧弬鏁�
@@ -49,7 +48,7 @@
t1.start()
#
# 鍚姩鍗庨懌浜ゆ槗鏈嶅姟
- huaxin_trade_server.run(pipe_trade, pipe_l1, pipe_l2, queue_strategy_trade)
+ huaxin_trade_server.run(queue_strategy_r_trade_w, pipe_l1, pipe_l2, queue_strategy_w_trade_r)
# 涓绘湇鍔�
@@ -83,8 +82,7 @@
log.close_print()
# 绛栫暐涓巗erver闂寸殑閫氫俊
pss_server, pss_strategy = multiprocessing.Pipe()
- # 绛栫暐涓庝氦鏄撻棿鐨勯�氫俊
- pst_trade, pst_strategy = multiprocessing.Pipe()
+
# 浜ゆ槗涓巐2涔嬮棿鐨勯�氫俊
ptl2_trade, ptl2_l2 = multiprocessing.Pipe()
# 绛栫暐涓巐2涔嬮棿鐨勯�氫俊
@@ -93,7 +91,10 @@
# l1涓庣瓥鐣ラ棿鐨勯�氫俊
pl1t_l1, pl1t_strategy = multiprocessing.Pipe()
- queue_strategy_trade = multiprocessing.Queue()
+ # 浜ゆ槗璇荤瓥鐣ュ啓
+ queue_strategy_w_trade_r = multiprocessing.Queue()
+ # 绛栫暐璇讳氦鏄撳啓
+ queue_strategy_r_trade_w = multiprocessing.Queue()
# 鎵樼鐜涓嬩笉鍒涘缓
# serverProcess = multiprocessing.Process(target=createServer, args=(pss_server,))
@@ -106,11 +107,11 @@
# 浜ゆ槗杩涚▼
tradeProcess = multiprocessing.Process(
- target=lambda: huaxin_client.trade_client.run(None, ptl2_trade, pst_trade, queue_strategy_trade))
+ target=lambda: huaxin_client.trade_client.run(None, ptl2_trade, queue_strategy_r_trade_w, queue_strategy_w_trade_r))
tradeProcess.start()
# 涓昏繘绋�
- createTradeServer(pss_strategy, pst_strategy, pl1t_strategy, psl2_strategy, ptl2_l2, psl2_l2, queue_strategy_trade)
+ createTradeServer(pss_strategy, queue_strategy_r_trade_w, pl1t_strategy, psl2_strategy, ptl2_l2, psl2_l2, queue_strategy_w_trade_r)
# 灏唗radeServer浣滀负涓昏繘绋�
l1Process.join()
--
Gitblit v1.8.0