From ae8d76a456b64c1c6c4ebf11b6ec33b7df217b1a Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 18 八月 2025 13:43:46 +0800
Subject: [PATCH] bug修复
---
task/task_manager.py | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/task/task_manager.py b/task/task_manager.py
index de8ed51..a7c4746 100644
--- a/task/task_manager.py
+++ b/task/task_manager.py
@@ -4,9 +4,11 @@
import threading
import time
+import constant
from db import redis_manager_delegate as redis_manager
from l2 import l2_log
from l2.huaxin import huaxin_target_codes_manager
+from l2.subscript import l2_subscript_manager
from log_module import async_log_util
from log_module.log import logger_system, logger_l2_codes_subscript, logger_debug
from servers.huaxin_trade_server import TradeServerProcessor
@@ -24,7 +26,6 @@
val = queue_l1_w_strategy_r.get()
if val:
val = json.loads(val)
- # print("鏀跺埌鏉ヨ嚜L1鐨勬暟鎹細", val["type"])
# 澶勭悊鏁版嵁
type_ = val["type"]
timestamp = val.get("time")
@@ -52,10 +53,9 @@
times = _datas[0]
datas = _datas[1]
request_id = _datas[2]
- logger_l2_codes_subscript.info("({})璇诲彇L2浠ｇ爜澶勭悊闃熷垪锛氭暟閲�-{}", request_id, len(datas))
+ async_log_util.info(logger_l2_codes_subscript, "({})璇诲彇L2浠ｇ爜澶勭悊闃熷垪锛氭暟閲�-{}", request_id, len(datas))
# 鍙鐞�20s鍐呯殑鏁版嵁
if time.time() - times < 20:
- # 鑾峰彇娑ㄥ仠鍒楄〃涓殑鏁版嵁
# datas涓殑鏁版嵁鏍煎紡:(浠ｇ爜, 鐜颁环, 娑ㄥ箙, 閲�, 鏃堕棿)
if not datas:
# 娌℃湁鏁版嵁闇�瑕佸鐞�
@@ -65,9 +65,19 @@
codes = [d[0] for d in datas]
for code in codes:
block_info.init_code(code)
- root_data = {"type": ClientSocketManager.CLIENT_TYPE_CMD_L2,
- "data": datas}
- queue_other_w_l2_r.put_nowait(json.dumps(root_data))
+ if constant.IS_L2_NEW:
+ process_manager: l2_subscript_manager.TargetCodeProcessManager = l2_subscript_manager\
+ .process_manager
+ queue_codes_list = process_manager.set_codes(set(codes))
+ code_data_dict = {d[0]: d for d in datas}
+ for queue_codes in queue_codes_list:
+ root_data = {"type": ClientSocketManager.CLIENT_TYPE_CMD_L2,
+ "data": [code_data_dict.get(c) for c in queue_codes[1]]}
+ queue_codes[0].put_nowait(json.dumps(root_data))
+ else:
+ root_data = {"type": ClientSocketManager.CLIENT_TYPE_CMD_L2,
+ "data": datas}
+ queue_other_w_l2_r.put_nowait(json.dumps(root_data))
# 濡傛灉鍦�9:25-9:29 闇�瑕佸姞杞芥澘鍧�
# if int("092500") < int(tool.get_now_time_str().replace(":", "")) < int("092900"):
# for d in datas:
@@ -78,7 +88,7 @@
# KPLLimitUpDataRecordManager.get_current_reasons()),
# daemon=True).start()
# time.sleep(0.2)
- logger_l2_codes_subscript.info("({})鍙戦�佸埌鍗庨懌L2浠ｇ爜澶勭悊闃熷垪锛氭暟閲�-{}", request_id, len(datas))
+ async_log_util.info(logger_l2_codes_subscript, "({})鍙戦�佸埌鍗庨懌L2浠ｇ爜澶勭悊闃熷垪锛氭暟閲�-{}", request_id, len(datas))
except Exception as e:
logging.exception(e)
logger_l2_codes_subscript.exception(e)
--
Gitblit v1.8.0