From b8c569f1025c65ef25fdf31c30a95e2d2a66d891 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 23 八月 2023 18:01:46 +0800
Subject: [PATCH] H/L/S撤日志改为异步
---
l2/l2_log.py | 10 +++++++++-
l2/cancel_buy_strategy.py | 22 ++++++++++------------
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/l2/cancel_buy_strategy.py b/l2/cancel_buy_strategy.py
index deb88bd..7aee5fd 100644
--- a/l2/cancel_buy_strategy.py
+++ b/l2/cancel_buy_strategy.py
@@ -18,11 +18,10 @@
from l2.safe_count_manager import BuyL2SafeCountManager
from l2.transaction_progress import TradeBuyQueue
from output import kp_client_msg_manager
-from trade import trade_data_manager, trade_queue_manager, l2_trade_factor
-from l2 import l2_log, l2_data_log, l2_data_source_util
+from trade import trade_queue_manager, l2_trade_factor
+from l2 import l2_log, l2_data_source_util
from l2.l2_data_util import L2DataUtil, local_today_num_operate_map, local_today_datas
-from log_module.log import logger_buy_1_volumn, logger_l2_h_cancel, logger_l2_s_cancel, logger_l2_d_cancel, \
- logger_l2_l_cancel
+from log_module.log import logger_buy_1_volumn, logger_l2_d_cancel
from utils.tool import CodeDataCacheUtil
@@ -595,10 +594,9 @@
l2_log.cancel_debug(code, "H绾ф挙鍗曡绠楃粨鏋� 鑼冨洿锛歿}-{} 澶勭悊杩涘害锛歿} 鍙栨秷璁＄畻缁撴灉:{}/{} 鐩爣鎾ゅ崟姣斾緥锛歿}", start_index, end_index,
process_index, cancel_num,
total_nums, cancel_rate_threshold)
- logger_l2_h_cancel.info(
- f"code-{code} H绾ф挙鍗曡绠楃粨鏋� 鑼冨洿锛歿start_index}-{end_index} 澶勭悊杩涘害锛歿process_index} 鐩爣姣斾緥锛歿cancel_rate_threshold} 鍙栨秷璁＄畻缁撴灉:{cancel_num}/{total_nums}")
+ l2_log.h_cancel_debug(code,f"H绾ф挙鍗曡绠楃粨鏋� 鑼冨洿锛歿start_index}-{end_index} 澶勭悊杩涘害锛歿process_index} 鐩爣姣斾緥锛歿cancel_rate_threshold} 鍙栨秷璁＄畻缁撴灉:{cancel_num}/{total_nums}")
# H鎾ゅ凡鎾よ鍗�
- logger_l2_h_cancel.info(f"code-{code} H鎾ゅ凡鎾よ鍗曪細{self.__get_watch_canceled_index_cache(code)}")
+ l2_log.h_cancel_debug(code, f"H鎾ゅ凡鎾よ鍗曪細{self.__get_watch_canceled_index_cache(code)}")
# 淇濆瓨澶勭悊杩涘害涓庢暟鎹�
self.__save_compute_data(code, process_index, cancel_num)
# 鏈夎娴嬫暟鎹挙鍗�
@@ -632,7 +630,7 @@
local_today_num_operate_map)
else:
self.__save_traded_progress(code, origin_index, index)
- logger_l2_h_cancel.info(f"code-{code} 鎴愪氦杩涘害锛歿index} 鏁版嵁缁撴潫浣嶇疆锛�" + str(total_data[-1]["index"]))
+ l2_log.h_cancel_debug(code, f"鎴愪氦杩涘害锛歿index} 鏁版嵁缁撴潫浣嶇疆锛�" + str(total_data[-1]["index"]))
# 娑ㄥ仠涔版槸鍚︽挙鍗�
def __get_limit_up_buy_no_canceled_count(self, code, index, total_data, local_today_num_operate_map,
@@ -708,7 +706,7 @@
final_watch_list = list(watch_set)
final_watch_list.sort(key=lambda x: x[0])
- logger_l2_h_cancel.info(f"code-{code} H鎾ょ洃鎺ф垚浜や綅鍒版墽琛屼綅:{final_watch_list}")
+ l2_log.h_cancel_debug(code,f"H鎾ょ洃鎺ф垚浜や綅鍒版墽琛屼綅:{final_watch_list}")
self.__save_watch_index_set(code, final_watch_list, buy_exec_index, True)
# 鍒犻櫎鍘熸潵鐨勮绠楁暟鎹�
# cls.__del_compute_data(code)
@@ -767,7 +765,7 @@
final_watch_list = list(watch_set)
final_watch_list.sort(key=lambda x: x[0])
- logger_l2_h_cancel.info(f"code-{code} H鎾ょ洃鎺ф墽琛屼綅鐩搁偦鍗�:{final_watch_list} 鐩爣璁＄畻鏁伴噺锛歿MIN_H_COUNT}")
+ l2_log.h_cancel_debug(code, f"H鎾ょ洃鎺ф墽琛屼綅鐩搁偦鍗�:{final_watch_list} 鐩爣璁＄畻鏁伴噺锛歿MIN_H_COUNT}")
# 淇濆瓨璁＄畻鑼冨洿
self.__save_watch_index_set_after_exec(code, final_watch_list, process_index, total_count, big_num_count,
finished)
@@ -1025,7 +1023,7 @@
if len(watch_indexes) >= constant.L_CANCEL_MAX_WATCH_COUNT:
break
- logger_l2_l_cancel.info(f"{code}:璁剧疆鐩戝惉鑼冨洿锛屾垚浜よ繘搴�-{index} 鐩戝惉鑼冨洿-{watch_indexes}")
+ l2_log.l_cancel_debug(code, f"璁剧疆鐩戝惉鑼冨洿锛屾垚浜よ繘搴�-{index} 鐩戝惉鑼冨洿-{watch_indexes}")
# 鏁版嵁缁存姢
add_indexes = watch_indexes - old_watch_indexes
delete_indexes = old_watch_indexes - watch_indexes
@@ -1069,7 +1067,7 @@
local_today_num_operate_map)
canceled_num += (total_data[wi]["re"] - left_count) * int(total_data[wi]["val"]["num"])
rate = round(canceled_num / total_num, 3)
- logger_l2_l_cancel.info(f"{code}锛氳绠楄寖鍥达細{start_index}-{end_index},宸叉挙鍗曟瘮渚嬶細{rate}")
+ l2_log.l_cancel_debug(code, f"璁＄畻鑼冨洿锛歿start_index}-{end_index},宸叉挙鍗曟瘮渚嬶細{rate}")
if rate >= constant.L_CANCEL_RATE:
return True, total_data[-1]
diff --git a/l2/l2_log.py b/l2/l2_log.py
index 0a7773d..dca9f37 100644
--- a/l2/l2_log.py
+++ b/l2/l2_log.py
@@ -1,6 +1,6 @@
from log_module import async_log_util
from log_module.log import logger_l2_trade_cancel, logger_l2_trade_buy, logger_trade_record, logger_l2_trade, \
- logger_l2_s_cancel
+ logger_l2_s_cancel, logger_l2_h_cancel, logger_l2_l_cancel
threadIds = {}
@@ -25,6 +25,14 @@
("thread-id={} code={} ".format(threadIds.get(code), code) + content).format(*args))
+def h_cancel_debug(code, content, *args):
+ async_log_util.debug(logger_l2_h_cancel,
+ ("thread-id={} code={} ".format(threadIds.get(code), code) + content).format(*args))
+
+
+def l_cancel_debug(code, content, *args):
+ async_log_util.debug(logger_l2_l_cancel,
+ ("thread-id={} code={} ".format(threadIds.get(code), code) + content).format(*args))
# 浜ゆ槗璁板綍
--
Gitblit v1.8.0