From 6e16ef632b6a2df5c1514011e4495949cd8a26bd Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 30 一月 2024 13:45:46 +0800
Subject: [PATCH] 根据L1数据来卖的规则单独封装
---
main.py | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/main.py b/main.py
index 991eaac..7688f1a 100644
--- a/main.py
+++ b/main.py
@@ -11,6 +11,7 @@
import huaxin_client.trade_client
import huaxin_client.l2_client
import huaxin_client.l1_client
+import huaxin_client.l1_client_for_trade
from log_module import log
from log_module.log import logger_l2_trade, logger_system, logger_local_huaxin_l1
@@ -20,7 +21,6 @@
from third_data import data_server
from trade.huaxin import huaxin_trade_server, huaxin_trade_api_server
-
# from huaxin_api import trade_client, l2_client, l1_client
from utils import tool
@@ -29,7 +29,7 @@
queue_l1_w_strategy_r_: multiprocessing.Queue,
queue_strategy_w_trade_r_: multiprocessing.Queue,
queue_strategy_w_trade_r_for_read_: multiprocessing.Queue, order_queues_, transaction_queues_,
- market_queue_,queue_l1_r_strategy_w):
+ market_queue_, queue_l1_trade_r_strategy_w, queue_l1_trade_w_strategy_r):
logger_system.info("绛栫暐杩涚▼ID锛歿}", os.getpid())
log.close_print()
# 鍒濆鍖栧弬鏁�
@@ -41,7 +41,7 @@
#
# 浜ゆ槗鎺ュ彛鏈嶅姟
t1 = threading.Thread(target=huaxin_trade_api_server.run, name="trade_api_server",
- args=(pipe_server, queue_other_w_l2_r, queue_l1_r_strategy_w),
+ args=(pipe_server, queue_other_w_l2_r, queue_l1_trade_r_strategy_w),
daemon=True)
t1.start()
#
@@ -52,7 +52,8 @@
# 鍚姩鍗庨懌浜ゆ槗鏈嶅姟
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_, order_queues_,
- transaction_queues_, market_queue_)
+ transaction_queues_, market_queue_,
+ queue_l1_trade_w_strategy_r)
# 涓绘湇鍔�
@@ -60,7 +61,8 @@
logger_system.info("create Server")
laddr = "", 9001
try:
- tcpserver = server.MyThreadingTCPServer(laddr, server.MyBaseRequestHandle, pipe_trade=pipe) # 娉ㄦ剰锛氬弬鏁版槸MyBaseRequestHandle
+ tcpserver = server.MyThreadingTCPServer(laddr, server.MyBaseRequestHandle,
+ pipe_trade=pipe) # 娉ㄦ剰锛氬弬鏁版槸MyBaseRequestHandle
tcpserver.serve_forever()
except Exception as e:
logger_system.exception(e)
@@ -92,9 +94,12 @@
# L2璇诲叾浠栧啓
queue_other_w_l2_r = multiprocessing.Queue()
- #
+ # l1
queue_l1_w_strategy_r = multiprocessing.Queue()
queue_l1_r_strategy_w = multiprocessing.Queue()
+ # l1浜ゆ槗
+ queue_l1_trade_w_strategy_r = multiprocessing.Queue()
+ queue_l1_trade_r_strategy_w = multiprocessing.Queue()
# 浜ゆ槗璇荤瓥鐣ュ啓
queue_strategy_w_trade_r = multiprocessing.Queue()
@@ -111,6 +116,10 @@
l1Process = multiprocessing.Process(target=huaxin_client.l1_client.run,
args=(queue_l1_w_strategy_r, queue_l1_r_strategy_w,))
l1Process.start()
+
+ l1TradeProcess = multiprocessing.Process(target=huaxin_client.l1_client_for_trade.run,
+ args=(queue_l1_trade_w_strategy_r, queue_l1_trade_r_strategy_w,))
+ l1TradeProcess.start()
# 浜ゆ槗杩涚▼
tradeProcess = multiprocessing.Process(
@@ -137,7 +146,8 @@
# 涓昏繘绋�
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,
- order_queues, transaction_queues, market_queue,queue_l1_r_strategy_w)
+ order_queues, transaction_queues, market_queue, queue_l1_trade_r_strategy_w,
+ queue_l1_trade_w_strategy_r)
# 灏唗radeServer浣滀负涓昏繘绋�
l1Process.join()
--
Gitblit v1.8.0