From 1252c9489b631905fbce608109260760537b224f Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期日, 05 二月 2023 19:19:34 +0800
Subject: [PATCH] S撤,安全笔数计算优化

---
 log.py |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/log.py b/log.py
index a676d9b..d688e3d 100644
--- a/log.py
+++ b/log.py
@@ -4,6 +4,7 @@
 import datetime
 import json
 import os
+import shutil
 import sys
 
 from loguru import logger
@@ -63,6 +64,10 @@
                    filter=lambda record: record["extra"].get("name") == "l2_trade_queue",
                    rotation="00:00", compression="zip", enqueue=True)
 
+        logger.add(self.get_path("l2", "l2_trade_buy_queue"),
+                   filter=lambda record: record["extra"].get("name") == "l2_trade_buy_queue",
+                   rotation="00:00", compression="zip", enqueue=True)
+
         logger.add(self.get_path("juejin", "juejin_tick"),
                    filter=lambda record: record["extra"].get("name") == "juejin_tick",
                    rotation="00:00", compression="zip", enqueue=True)
@@ -114,6 +119,7 @@
 logger_l2_trade_cancel = __mylogger.get_logger("l2_trade_cancel")
 logger_l2_trade_buy = __mylogger.get_logger("l2_trade_buy")
 logger_l2_trade_queue = __mylogger.get_logger("l2_trade_queue")
+logger_l2_trade_buy_queue = __mylogger.get_logger("l2_trade_buy_queue")
 
 logger_l2_big_data = __mylogger.get_logger("l2_big_data")
 logger_juejin_tick = __mylogger.get_logger("juejin_tick")
@@ -288,20 +294,23 @@
 def export_logs(code):
     code_name = gpcode_manager.get_code_name(code)
     date = datetime.datetime.now().strftime("%Y-%m-%d")
+    target_dir = f"D:/logs/gp/l2/export/{code}_{code_name}_{date}"
+    if os.path.exists(target_dir):
+        shutil.rmtree(target_dir)
+    os.makedirs(target_dir)
+    log_names = ["l2_process", "l2_trade", "l2_trade_cancel", "l2_process_time", "l2_trade_buy"]
     # 瀵煎嚭浜ゆ槗鏃ュ織
-    LogUtil.extract_log_from_key("code={}".format(code), "D:/logs/gp/l2/l2_trade.{}.log".format(date),
-                                 "D:/logs/gp/l2/l2_trade.{}_{}.{}.log".format(code, code_name, date))
-    # 瀵煎嚭鍙栨秷鏃ュ織
-    LogUtil.extract_log_from_key("code={}".format(code), "D:/logs/gp/l2/l2_trade_cancel.{}.log".format(date),
-                                 "D:/logs/gp/l2/l2_trade_cancel.{}_{}.{}.log".format(code, code_name, date))
-
-    LogUtil.extract_log_from_key("{}".format(code), "D:/logs/gp/l2/l2_process.{}.log".format(date),
-                                 "D:/logs/gp/l2/l2_process.{}_{}.{}.log".format(code, code_name, date))
+    for log_name in log_names:
+        key = f"code={code}"
+        if log_name == "l2_process" or log_name == "l2_process_time":
+            key = code
+        LogUtil.extract_log_from_key(key, f"D:/logs/gp/l2/{log_name}.{date}.log".format(date),
+                                     f"{target_dir}/{log_name}.{code}_{code_name}.{date}.log")
 
 
 if __name__ == '__main__':
     # logger_l2_process_time.info("test123")
-    codes = ["002766"]
+    codes = ["002842"]
     for code in codes:
         export_logs(code)
 

--
Gitblit v1.8.0