Administrator
2023-08-24 9fe04a46d2b208508658e3e5421c9c9832bbee63
异步日志bug修改
2个文件已修改
53 ■■■■■ 已修改文件
l2/cancel_buy_strategy.py 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
l2/l2_log.py 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
l2/cancel_buy_strategy.py
@@ -594,7 +594,8 @@
            l2_log.cancel_debug(code, "H级撤单计算结果 范围:{}-{} 处理进度:{} 取消计算结果:{}/{} 目标撤单比例:{}", start_index, end_index,
                                process_index, cancel_num,
                                total_nums, cancel_rate_threshold)
            l2_log.h_cancel_debug(code,f"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撤已撤订单
            l2_log.h_cancel_debug(code, f"H撤已撤订单:{self.__get_watch_canceled_index_cache(code)}")
            # 保存处理进度与数据
@@ -706,7 +707,7 @@
        final_watch_list = list(watch_set)
        final_watch_list.sort(key=lambda x: x[0])
        l2_log.h_cancel_debug(code,f"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)
@@ -1551,3 +1552,8 @@
        if cancel_index is not None:
            return total_datas[cancel_index], "板上卖的手数{} 超过{}".format(total_num, threshold_num)
        return None, ""
if __name__ == "__main__":
    s = {"618-1047", "604-1292", "614-5106"}
    l2_log.h_cancel_debug("000333", "H撤已撤订单:{}", "test")
l2/l2_log.py
@@ -1,42 +1,53 @@
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_h_cancel, logger_l2_l_cancel
    logger_l2_s_cancel, logger_l2_h_cancel, logger_l2_l_cancel, logger_l2_error
threadIds = {}
def __add_async_log(logger_, code, content, *args):
    try:
        if len(args) > 0:
            async_log_util.debug(logger_,
                                 ("thread-id={} code={}  ".format(threadIds.get(code), code) + content).format(*args))
        else:
            async_log_util.debug(logger_,
                                 "thread-id={} code={}  ".format(threadIds.get(code), code) + content)
    except Exception as e:
        logger_l2_error.exception(e)
def debug(code, content, *args):
    async_log_util.debug(logger_l2_trade,
                         ("thread-id={} code={}  ".format(threadIds.get(code), code) + content).format(*args))
    __add_async_log(logger_l2_trade, code, content, *args)
def buy_debug(code, content, *args):
    async_log_util.debug(logger_l2_trade_buy,
                         ("thread-id={} code={}  ".format(threadIds.get(code), code) + content).format(*args))
    __add_async_log(logger_l2_trade_buy, code, content, *args)
def cancel_debug(code, content, *args):
    async_log_util.debug(logger_l2_trade_cancel,
                         ("thread-id={} code={}  ".format(threadIds.get(code), code) + content).format(*args))
    __add_async_log(logger_l2_trade_cancel, code, content, *args)
def s_cancel_debug(code, content, *args):
    async_log_util.debug(logger_l2_s_cancel,
                         ("thread-id={} code={}  ".format(threadIds.get(code), code) + content).format(*args))
    __add_async_log(logger_l2_s_cancel, code, content, *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))
    __add_async_log(logger_l2_h_cancel, code, content, *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))
    __add_async_log(logger_l2_l_cancel, code, content, *args)
# 交易记录
def trade_record(code, type, content, *args):
    async_log_util.debug(logger_trade_record,
                         ("thread-id={} code={} type={} data=".format(threadIds.get(code), code,
                                                                      type) + content).format(*args))
    if len(args) > 0:
        async_log_util.debug(logger_trade_record,
                             ("thread-id={} code={} type={} data=".format(threadIds.get(code), code,
                                                                          type) + content).format(*args))
    else:
        async_log_util.debug(logger_trade_record,
                             "thread-id={} code={} type={} data=".format(threadIds.get(code), code,
                                                                         type) + content)