From 68341449fb7b175c4af9707036802e8e05a16bec Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 16 八月 2023 10:36:17 +0800
Subject: [PATCH] ++++++++++++++++ bug修复-
---
huaxin_api/l2_client.py | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/huaxin_api/l2_client.py b/huaxin_api/l2_client.py
index 2d22d6a..59a36f0 100644
--- a/huaxin_api/l2_client.py
+++ b/huaxin_api/l2_client.py
@@ -10,8 +10,9 @@
from huaxin_api import l2_data_manager
import lev2mdapi
from huaxin_api.command_manager import L2ActionCallback
-from huaxin_api.mylog import logger_l2_orderdetail, logger_l2_transaction, logger_l2_subscript
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
Front_Address = "tcp://10.0.1.101:6900"
Multicast_Address = "udp://224.224.2.19:7889"
@@ -68,8 +69,8 @@
# 鍙栨秷璁㈤槄
def __unsubscribe(self, _codes):
sh, sz = self.__split_codes(_codes)
- logger_l2_subscript.info(f"鍙栨秷璁㈤槄涓婅瘉锛歿sh}")
- logger_l2_subscript.info(f"鍙栨秷璁㈤槄娣辫瘉锛歿sz}")
+ logger_local_huaxin_l2_subscript.info(f"鍙栨秷璁㈤槄涓婅瘉锛歿sh}")
+ logger_local_huaxin_l2_subscript.info(f"鍙栨秷璁㈤槄娣辫瘉锛歿sz}")
if sh:
# 鍙栨秷璁㈤槄閫愮瑪濮旀墭
self.__api.UnSubscribeOrderDetail(sh, lev2mdapi.TORA_TSTP_EXD_SSE)
@@ -83,25 +84,25 @@
def __subscribe(self, _codes):
sh, sz = self.__split_codes(_codes)
- logger_l2_subscript.info(f"璁㈤槄涓婅瘉锛歿sh}")
- logger_l2_subscript.info(f"璁㈤槄娣辫瘉锛歿sz}")
+ logger_local_huaxin_l2_subscript.info(f"璁㈤槄涓婅瘉锛歿sh}")
+ logger_local_huaxin_l2_subscript.info(f"璁㈤槄娣辫瘉锛歿sz}")
if sh:
# 璁㈤槄閫愮瑪濮旀墭
result = self.__api.SubscribeOrderDetail(sh, lev2mdapi.TORA_TSTP_EXD_SSE)
- logger_l2_subscript.info(f"閫愮瑪濮旀墭璁㈤槄缁撴灉sh锛歿result}")
+ logger_local_huaxin_l2_subscript.info(f"閫愮瑪濮旀墭璁㈤槄缁撴灉sh锛歿result}")
# 璁㈤槄閫愮瑪鎴愪氦
result = self.__api.SubscribeTransaction(sh, lev2mdapi.TORA_TSTP_EXD_SSE)
- logger_l2_subscript.info(f"閫愮瑪鎴愪氦璁㈤槄缁撴灉sh锛歿result}")
+ logger_local_huaxin_l2_subscript.info(f"閫愮瑪鎴愪氦璁㈤槄缁撴灉sh锛歿result}")
result = self.__api.SubscribeMarketData(sh, lev2mdapi.TORA_TSTP_EXD_SSE)
- logger_l2_subscript.info(f"甯傚満璁㈤槄缁撴灉sh锛歿result}")
+ logger_local_huaxin_l2_subscript.info(f"甯傚満璁㈤槄缁撴灉sh锛歿result}")
if sz:
result = self.__api.SubscribeOrderDetail(sz, lev2mdapi.TORA_TSTP_EXD_SZSE)
- logger_l2_subscript.info(f"閫愮瑪濮旀墭璁㈤槄缁撴灉sz锛歿result}")
+ logger_local_huaxin_l2_subscript.info(f"閫愮瑪濮旀墭璁㈤槄缁撴灉sz锛歿result}")
result = self.__api.SubscribeTransaction(sz, lev2mdapi.TORA_TSTP_EXD_SZSE)
- logger_l2_subscript.info(f"閫愮瑪鎴愪氦璁㈤槄缁撴灉sz锛歿result}")
+ logger_local_huaxin_l2_subscript.info(f"閫愮瑪鎴愪氦璁㈤槄缁撴灉sz锛歿result}")
result = self.__api.SubscribeMarketData(sz, lev2mdapi.TORA_TSTP_EXD_SZSE)
- logger_l2_subscript.info(f"甯傚満璁㈤槄缁撴灉sz锛歿result}")
+ logger_local_huaxin_l2_subscript.info(f"甯傚満璁㈤槄缁撴灉sz锛歿result}")
def __process_codes_data(self, codes_data):
@@ -170,7 +171,7 @@
# try:
print("璁㈤槄缁撴灉锛�", pSpecificSecurity["ExchangeID"], pSpecificSecurity["SecurityID"], pRspInfo["ErrorID"],
pRspInfo["ErrorMsg"])
- logger_l2_subscript.info(
+ logger_local_huaxin_l2_subscript.info(
f"璁㈤槄缁撴灉锛歿pSpecificSecurity['SecurityID']} {pRspInfo['ErrorID']} {pRspInfo['ErrorMsg']}")
if pRspInfo["ErrorID"] == 0:
print("璁㈤槄鎴愬姛")
@@ -305,7 +306,7 @@
# print("閫愮瑪鎴愪氦", item)
l2_data_manager.add_transaction_detail(item)
- logger_l2_transaction.info(
+ logger_local_huaxin_l2_transaction.info(
"OnRtnTransaction SecurityID[%s] TradePrice[%.2f] TradeVolume[%d] TradeTime[%d] MainSeq[%d] SubSeq[%d] BuyNo[%d] SellNo[%d] ExecType[%s]" % (
pTransaction['SecurityID'],
pTransaction['TradePrice'],
@@ -347,7 +348,7 @@
print("閫愮瑪濮旀墭", item)
l2_data_manager.add_l2_order_detail(item)
- logger_l2_orderdetail.info(
+ logger_local_huaxin_l2_orderdetail.info(
"OnRtnOrderDetail SecurityID[%s] Price[%.2f] Volume[%d] Side[%s] OrderType[%s] OrderTime[%d] MainSeq[%d] SubSeq[%d] OrderNO[%s] OrderStatus[%s] Info1[%d] Info2[%d] Info3[%d]" % (
pOrderDetail['SecurityID'],
pOrderDetail['Price'],
--
Gitblit v1.8.0