From 3b435873873d5cd498086d9f6afaef3af758a856 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 13 九月 2023 23:28:51 +0800
Subject: [PATCH] H撤重新定义
---
l2/l2_data_manager_new.py | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index c1dcad7..6ecbb74 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -262,7 +262,7 @@
if not is_normal:
print("鍘嗗彶鏁版嵁寮傚父:", code)
# 鏁版嵁涓嶆甯搁渶瑕佺姝氦鏄�
- l2_trade_util.forbidden_trade(code)
+ l2_trade_util.forbidden_trade(code, msg="L2鍘嗗彶鏁版嵁寮傚父")
# 绾犳鏁版嵁
if constant.L2_SOURCE_TYPE == constant.L2_SOURCE_TYPE_THS:
# 鍚岃姳椤洪渶瑕佺籂姝ｆ暟鎹紝鍏朵粬娓犻亾涓嶉渶瑕�
@@ -303,7 +303,7 @@
if not is_normal:
print("鍘嗗彶鏁版嵁寮傚父:", code)
# 鏁版嵁涓嶆甯搁渶瑕佺姝氦鏄�
- l2_trade_util.forbidden_trade(code)
+ l2_trade_util.forbidden_trade(code, msg="L2鍘嗗彶鏁版嵁寮傚父")
origin_start_time = round(t.time() * 1000)
# 杞崲鏁版嵁鏍煎紡
_start_index = 0
@@ -328,10 +328,8 @@
# f.write(output.getvalue())
# lp.dump_stats(f"/home/logs/profile/{code}_{round(t.time() * 1000)}.txt")
except Exception as e:
- print("huaxin L2鏁版嵁澶勭悊寮傚父", code, str(e))
- logging.exception(e)
- logger_l2_error.exception(f"code:{code}")
- logger_l2_error.exception(e)
+ async_log_util.error(logger_l2_error,f"code:{code}")
+ async_log_util.exception(logger_l2_error, e)
finally:
# l2_data_log.l2_time(code, round(t.time() * 1000) - origin_start_time,
# "l2鏁版嵁澶勭悊鎬昏�楁椂",
@@ -357,14 +355,14 @@
cls.set_real_place_order_index(code, place_order_index, buy_single_index)
async_log_util.info(logger_l2_process, "code:{} 鑾峰彇鍒颁笅鍗曠湡瀹炰綅缃細{}", code, place_order_index)
except:
- logger_l2_error.exception(f"{code} 澶勭悊鐪熷疄涓嬪崟浣嶇疆鍑洪敊")
+ async_log_util.error(logger_l2_error, f"{code} 澶勭悊鐪熷疄涓嬪崟浣嶇疆鍑洪敊")
# 绗�1鏉℃暟鎹槸鍚︿负09:30:00
if add_datas[0]["val"]["time"] == "09:30:00":
if global_util.cuurent_prices.get(code):
price_data = global_util.cuurent_prices.get(code)
if price_data[1]:
# 褰撳墠娑ㄥ仠浠凤紝璁剧疆娑ㄥ仠鏃堕棿
- logger_l2_process.info("寮�鐩樻定鍋滐細{}", code)
+ async_log_util.info(logger_l2_process, "寮�鐩樻定鍋滐細{}", code)
# 淇濆瓨娑ㄥ仠鏃堕棿
cls.__LimitUpTimeManager.save_limit_up_time(code, "09:30:00")
@@ -464,7 +462,7 @@
# 澧炲姞鎺ㄥ嚭鏈哄埗
unique_key = f"{start_index}-{end_index}"
if cls.__latest_process_order_unique_keys.get(code) == unique_key:
- logger_l2_error.error(f"閲嶅澶勭悊鏁版嵁锛歝ode-{code} start_index-{start_index} end_index-{end_index}")
+ async_log_util.error(logger_l2_error, f"閲嶅澶勭悊鏁版嵁锛歝ode-{code} start_index-{start_index} end_index-{end_index}")
return
cls.__latest_process_order_unique_keys[code] = unique_key
@@ -486,8 +484,8 @@
return b_cancel_data, "S澶у崟鎾ら攢姣斾緥瑙﹀彂闃堝��"
except Exception as e:
logging.exception(e)
- logger_l2_error.error(f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
- logger_l2_error.exception(e)
+ async_log_util.error(logger_l2_error, f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
+ async_log_util.exception(logger_l2_error, e)
finally:
# l2_data_log.l2_time(code, round(t.time() * 1000) - _start_time,
# "宸蹭笅鍗�-s绾уぇ鍗曚及绠�")
@@ -510,9 +508,8 @@
if b_need_cancel and b_cancel_data:
return b_cancel_data, "H鎾ら攢姣斾緥瑙﹀彂闃堝��"
except Exception as e:
- logging.exception(e)
- logger_l2_error.error(f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
- logger_l2_error.exception(e)
+ async_log_util.error(logger_l2_error, f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
+ async_log_util.exception(logger_l2_error, e)
finally:
# l2_data_log.l2_time(code, round(t.time() * 1000) - _start_time, "宸蹭笅鍗�-H鎾ゅぇ鍗曡绠�")
pass
@@ -530,9 +527,8 @@
if b_need_cancel and b_cancel_data:
return b_cancel_data, "L鎾ら攢姣斾緥瑙﹀彂闃堝��"
except Exception as e:
- logging.exception(e)
- logger_l2_error.error(f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
- logger_l2_error.exception(e)
+ async_log_util.error(logger_l2_error, f"鍙傛暟锛歜uy_single_index-{_buy_single_index} buy_exec_index-{_buy_exec_index}")
+ async_log_util.exception(logger_l2_error, e)
finally:
# l2_data_log.l2_time(code, round(t.time() * 1000) - _start_time, "宸蹭笅鍗�-L鎾ゅぇ鍗曡绠�")
pass
@@ -617,7 +613,7 @@
buy_single_index, buy_exec_index, cls.volume_rate_info[code][0],
params_desc)
except Exception as e:
- logger_l2_error.exception(e)
+ async_log_util.exception(logger_l2_error, e)
l2_log.debug(code, "鎵ц涔板叆寮傚父:{}", str(e))
pass
finally:
@@ -906,7 +902,7 @@
# 鍒ゆ柇鏉垮潡
can_buy_result = CodePlateKeyBuyManager.can_buy(code)
if can_buy_result is None:
- logger_debug.warning("娌℃湁鑾峰彇鍒版澘鍧楃紦瀛橈紝灏嗚幏鍙栨澘鍧�")
+ async_log_util.warning(logger_debug, "娌℃湁鑾峰彇鍒版澘鍧楃紦瀛橈紝灏嗚幏鍙栨澘鍧�")
yesterday_codes = kpl_data_manager.get_yesterday_limit_up_codes()
CodePlateKeyBuyManager.update_can_buy_blocks(code,
kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas,
@@ -980,7 +976,7 @@
unique_key = f"{compute_start_index}-{compute_end_index}"
if cls.__latest_process_not_order_unique_keys.get(code) == unique_key:
- logger_l2_error.error(f"閲嶅澶勭悊鏁版嵁锛歝ode-{code} start_index-{compute_start_index} end_index-{compute_end_index}")
+ async_log_util.error(logger_l2_error, f"閲嶅澶勭悊鏁版嵁锛歝ode-{code} start_index-{compute_start_index} end_index-{compute_end_index}")
return
cls.__latest_process_not_order_unique_keys[code] = unique_key
--
Gitblit v1.8.0