From d6b6be5eb2ae00a8ccf46bd7d53cd7d0c1e59c72 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 24 十一月 2023 19:19:37 +0800
Subject: [PATCH] 初始化独立某些方法
---
main.py | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/main.py b/main.py
index 9e57f96..991eaac 100644
--- a/main.py
+++ b/main.py
@@ -1,10 +1,12 @@
"""
GUI绠＄悊
"""
-
+import logging
import multiprocessing
import os
+import threading
+import constant
from db import redis_manager_delegate as redis_manager
import huaxin_client.trade_client
import huaxin_client.l2_client
@@ -12,7 +14,7 @@
from log_module import log
from log_module.log import logger_l2_trade, logger_system, logger_local_huaxin_l1
-from server import *
+import server
# 浜ゆ槗鏈嶅姟
from third_data import data_server
@@ -20,17 +22,18 @@
# from huaxin_api import trade_client, l2_client, l1_client
+from utils import tool
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, order_queues_, transaction_queues_,
- market_queue_):
+ market_queue_,queue_l1_r_strategy_w):
logger_system.info("绛栫暐杩涚▼ID锛歿}", os.getpid())
log.close_print()
# 鍒濆鍖栧弬鏁�
- global_data_loader.init()
+ server.global_data_loader.init()
# # 鏁版嵁鏈嶅姟
t1 = threading.Thread(target=createDataServer, name="createDataServer", daemon=True)
@@ -38,7 +41,7 @@
#
# 浜ゆ槗鎺ュ彛鏈嶅姟
t1 = threading.Thread(target=huaxin_trade_api_server.run, name="trade_api_server",
- args=(pipe_server, queue_other_w_l2_r),
+ args=(pipe_server, queue_other_w_l2_r, queue_l1_r_strategy_w),
daemon=True)
t1.start()
#
@@ -47,7 +50,8 @@
t1.start()
#
# 鍚姩鍗庨懌浜ゆ槗鏈嶅姟
- 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_,
+ 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_)
@@ -56,7 +60,7 @@
logger_system.info("create Server")
laddr = "", 9001
try:
- tcpserver = MyThreadingTCPServer(laddr, 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)
@@ -90,6 +94,7 @@
queue_other_w_l2_r = multiprocessing.Queue()
#
queue_l1_w_strategy_r = multiprocessing.Queue()
+ queue_l1_r_strategy_w = multiprocessing.Queue()
# 浜ゆ槗璇荤瓥鐣ュ啓
queue_strategy_w_trade_r = multiprocessing.Queue()
@@ -103,7 +108,8 @@
logger_system.info("涓昏繘绋婭D锛歿}", os.getpid())
# L1璁㈤槄鏁版嵁
- l1Process = multiprocessing.Process(target=huaxin_client.l1_client.run, args=(queue_l1_w_strategy_r,))
+ l1Process = multiprocessing.Process(target=huaxin_client.l1_client.run,
+ args=(queue_l1_w_strategy_r, queue_l1_r_strategy_w,))
l1Process.start()
# 浜ゆ槗杩涚▼
@@ -131,7 +137,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,
- order_queues, transaction_queues, market_queue)
+ order_queues, transaction_queues, market_queue,queue_l1_r_strategy_w)
# 灏唗radeServer浣滀负涓昏繘绋�
l1Process.join()
--
Gitblit v1.8.0