From 21c96ed504f93f16ce6f8a3ccf164a87c9edd9c0 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 30 一月 2024 15:45:23 +0800
Subject: [PATCH] 增加调试日志

---
 huaxin_client/l1_client_for_trade.py |   33 ++++-----------------------------
 1 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/huaxin_client/l1_client_for_trade.py b/huaxin_client/l1_client_for_trade.py
index 7a67b9e..8e73cb3 100644
--- a/huaxin_client/l1_client_for_trade.py
+++ b/huaxin_client/l1_client_for_trade.py
@@ -39,13 +39,7 @@
     l1_data_queue = collections.deque()
     __subscribed_codes = set()
 
-    def __init__(self, api, codes_sh, codes_sz):
-        for i in range(3):
-            try:
-                self.codes_sh, self.codes_sz = codes_sh, codes_sz
-                break
-            except:
-                time.sleep(2)
+    def __init__(self, api):
         xmdapi.CTORATstpXMdSpi.__init__(self)
         self.__api = api
 
@@ -55,23 +49,6 @@
         # 璇锋眰鐧诲綍锛岀洰鍓嶆湭鏍¢獙鐧诲綍鐢ㄦ埛锛岃姹傚煙缃┖鍗冲彲
         login_req = xmdapi.CTORATstpReqUserLoginField()
         self.__api.ReqUserLogin(login_req, 1)
-
-    # 閲嶆柊璁㈤槄浠g爜
-    def subscribe_codes(self, codes_sh, codes_sz):
-        print(f"璁㈤槄鏁伴噺锛歴h-{len(codes_sh)}  sz-{len(codes_sz)}")
-        if codes_sh:
-            ret = self.__api.SubscribeMarketData(codes_sh, xmdapi.TORA_TSTP_EXD_SSE)
-            if ret != 0:
-                print('SubscribeMarketData fail, ret[%d]' % ret)
-            else:
-                print('SubscribeMarketData success, ret[%d]' % ret)
-
-        if codes_sz:
-            ret = self.__api.SubscribeMarketData(codes_sz, xmdapi.TORA_TSTP_EXD_SZSE)
-            if ret != 0:
-                print('SubscribeMarketData fail, ret[%d]' % ret)
-            else:
-                print('SubscribeMarketData success, ret[%d]' % ret)
 
     def __seperate_codes(self, codes):
         codes_sh = []
@@ -87,9 +64,9 @@
     def subscribe(self, codes: set):
         del_codes = self.__subscribed_codes - codes
         add_codes = codes - self.__subscribed_codes
-        logger_local_huaxin_l1.info(f"鏂板璁㈤槄锛歿add_codes} 鍑忓皯璁㈤槄锛歿del_codes}")
         if add_codes:
             codes_sh, codes_sz = self.__seperate_codes(add_codes)
+            logger_local_huaxin_l1.info(f"鏂板璁㈤槄锛歿codes_sh}  {codes_sz}")
             if codes_sh:
                 self.__api.SubscribeMarketData(codes_sh, xmdapi.TORA_TSTP_EXD_SSE)
             if codes_sz:
@@ -112,8 +89,6 @@
 			褰搒ub_arr涓彧鏈変竴涓�"00000000"鐨勫悎绾︿笖ExchangeID濉玊ORA_TSTP_EXD_COMM鏃讹紝璁㈤槄鍏ㄥ競鍦烘墍鏈夊悎绾﹁鎯�
 			鍏跺畠鎯呭喌锛岃闃卻ub_arr闆嗗悎涓殑鍚堢害琛屾儏
             '''
-
-            self.subscribe_codes(self.codes_sh, self.codes_sz)
             # sub_arr = [b'600004']
             # ret = self.__api.UnSubscribeMarketData(sub_arr, xmdapi.TORA_TSTP_EXD_SSE)
             # if ret != 0:
@@ -124,7 +99,7 @@
 
         else:
             logger_local_huaxin_l1.info('Login fail!!! [%d] [%d] [%s]'
-                  % (nRequestID, pRspInfoField.ErrorID, pRspInfoField.ErrorMsg))
+                                        % (nRequestID, pRspInfoField.ErrorID, pRspInfoField.ErrorMsg))
 
     def OnRspSubMarketData(self, pSpecificSecurityField, pRspInfoField):
         if pRspInfoField.ErrorID == 0:
@@ -201,7 +176,7 @@
 
     # 鍒涘缓鍥炶皟瀵硅薄
     global spi
-    spi = MdSpi(api, codes_sh, codes_sz)
+    spi = MdSpi(api)
 
     # 娉ㄥ唽鍥炶皟鎺ュ彛
     api.RegisterSpi(spi)

--
Gitblit v1.8.0