From b4480ad745510c8e81c88c20fb67cb65eef79cc5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 17 八月 2023 11:05:23 +0800
Subject: [PATCH] ++++++++++++++++ bug修复
---
huaxin_api/l2_client.py | 4 +++-
l2/l2_data_manager.py | 3 ++-
huaxin_api/trade_client.py | 4 +++-
huaxin_api/l1_client.py | 5 ++++-
main.py | 6 ++++--
log_module/log.py | 2 +-
6 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/huaxin_api/l1_client.py b/huaxin_api/l1_client.py
index 50df6b9..994d760 100644
--- a/huaxin_api/l1_client.py
+++ b/huaxin_api/l1_client.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import json
import logging
+import os
import threading
import time
@@ -8,6 +9,7 @@
import xmdapi
from huaxin_api import tool
from huaxin_api.client_network import SendResponseSkManager
+from log_module.log import logger_system
level1_data_dict = {
@@ -219,9 +221,10 @@
def run_async(pipe_l2):
+ logger_system.info("L1杩涚▼ID锛�", os.getpid())
t1 = threading.Thread(target=lambda: run(pipe_l2), daemon=True)
t1.start()
if __name__ == "__main__":
- run(None)
+ pass
diff --git a/huaxin_api/l2_client.py b/huaxin_api/l2_client.py
index 59a36f0..e425a05 100644
--- a/huaxin_api/l2_client.py
+++ b/huaxin_api/l2_client.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import json
import logging
+import os
import queue
import threading
import time
@@ -12,7 +13,7 @@
from huaxin_api.command_manager import L2ActionCallback
from log_module import log
from log_module.log import logger_local_huaxin_l2_subscript, logger_local_huaxin_l2_orderdetail, \
- logger_local_huaxin_l2_transaction
+ logger_local_huaxin_l2_transaction, logger_system
Front_Address = "tcp://10.0.1.101:6900"
Multicast_Address = "udp://224.224.2.19:7889"
@@ -538,6 +539,7 @@
def run(pipe_trade, pipe_strategy):
+ logger_system.info("L2杩涚▼ID锛�", os.getpid())
log.close_print()
if pipe_trade is not None:
t1 = threading.Thread(target=lambda: __receive_from_pipe_trade(pipe_trade), daemon=True)
diff --git a/huaxin_api/trade_client.py b/huaxin_api/trade_client.py
index 74af6f7..e11c2fc 100644
--- a/huaxin_api/trade_client.py
+++ b/huaxin_api/trade_client.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import json
import logging
+import os
import threading
import time
@@ -12,7 +13,7 @@
from huaxin_api.log import logger
# 姝ｅ紡璐﹀彿
-from log_module.log import logger_local_huaxin_trade_debug
+from log_module.log import logger_local_huaxin_trade_debug, logger_system
UserID = '388000013349'
# 鐧婚檰瀵嗙爜
@@ -975,6 +976,7 @@
def run(pipe_l2=None, pipe_strategy=None):
+ logger_system.info("浜ゆ槗杩涚▼ID锛�", os.getpid())
__init_trade_data_server()
global l2pipe
l2pipe = pipe_l2
diff --git a/l2/l2_data_manager.py b/l2/l2_data_manager.py
index 1289bf4..7013728 100644
--- a/l2/l2_data_manager.py
+++ b/l2/l2_data_manager.py
@@ -5,6 +5,7 @@
from db import redis_manager_delegate as redis_manager
from db.redis_manager_delegate import RedisUtils
+from log_module.log import logger_debug
from utils import tool
from utils.tool import CodeDataCacheUtil
@@ -103,12 +104,12 @@
if buy_single_index is not None:
data_ = (buy_single_index, buy_exec_index, compute_index, nums, count, list(max_num_sets),
volume_rate)
-
else:
_buy_single_index, _buy_exec_index, _compute_index, _nums, _count, _max_num_index, _volume_rate = self.get_buy_compute_start_data_cache(
code)
data_ = (_buy_single_index, buy_exec_index, compute_index, nums, count, list(max_num_sets),
volume_rate)
+ logger_debug.info(f"淇濆瓨涔板叆鎵ц浣嶇疆淇℃伅{code}锛歿data_}")
CodeDataCacheUtil.set_cache(self.__buy_compute_index_info_cache, code, data_)
RedisUtils.setex_async(self.__db, _key, expire, json.dumps(data_))
diff --git a/log_module/log.py b/log_module/log.py
index 8cb8292..7fde0a4 100644
--- a/log_module/log.py
+++ b/log_module/log.py
@@ -336,5 +336,5 @@
if __name__ == "__main__":
- logger_l2_trade.info("娴嬭瘯")
+ print(os.getpid())
input()
diff --git a/main.py b/main.py
index 139106e..4e57202 100644
--- a/main.py
+++ b/main.py
@@ -11,7 +11,7 @@
import huaxin_api.l2_client
import huaxin_api.l1_client
from log_module import log
-from log_module.log import logger_l2_trade
+from log_module.log import logger_l2_trade, logger_system
from server import *
@@ -24,6 +24,7 @@
def createTradeServer(pipe_server, pipe_trade, pipe_l1, pipe_l2):
+ logger_system.info("绛栫暐杩涚▼ID锛�", os.getpid())
log.close_print()
# 鍒濆鍖栧弬鏁�
global_data_loader.init()
@@ -60,7 +61,7 @@
if __name__ == '__main__':
- logger_l2_trade.info("test123123")
+ logger_l2_trade.info("鍚姩绋嬪簭")
log.close_print()
# 绛栫暐涓巗erver闂寸殑閫氫俊
pss_server, pss_strategy = multiprocessing.Pipe()
@@ -77,6 +78,7 @@
# 鎵樼鐜涓嬩笉鍒涘缓
# serverProcess = multiprocessing.Process(target=createServer, args=(pss_server,))
# serverProcess.start()
+ logger_system.info("涓昏繘绋婭D锛�", os.getpid())
tradeServerProcess = multiprocessing.Process(target=createTradeServer,
args=(pss_strategy, pst_strategy, pl1t_strategy, psl2_strategy))
--
Gitblit v1.8.0