From e1790699a10fa31e037d60e37f2fea6cf24d8db2 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 12 十月 2023 11:18:58 +0800
Subject: [PATCH] 真实下单位置的延时处理
---
outside_api_command_manager.py | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/outside_api_command_manager.py b/outside_api_command_manager.py
index cb6cdac..53c2b08 100644
--- a/outside_api_command_manager.py
+++ b/outside_api_command_manager.py
@@ -9,9 +9,10 @@
import time
# 蹇冭烦淇℃伅
-from huaxin_api import socket_util
-from huaxin_api.client_network import SendResponseSkManager
-from utils import middle_api_protocol
+from huaxin_client import socket_util
+from huaxin_client.client_network import SendResponseSkManager
+from log_module.log import logger_debug, logger_system
+from utils import middle_api_protocol, tool
MSG_TYPE_HEART = "heart"
# 鍛戒护淇℃伅
@@ -50,7 +51,9 @@
API_TYPE_CODE_ATRRIBUTE = "code_attribute" # 浠ｇ爜灞炴��
API_TYPE_CODE_TRADE_STATE = "code_trade_state" # 浠ｇ爜浜ゆ槗鐘舵��
API_TYPE_GET_ENV = "get_env" # 鑾峰彇鐜淇℃伅
-
+API_TYPE_SYNC_L1_TARGET_CODES = "sync_l1_subscript_codes" # 鍚屾L1闇�瑕佽闃呯殑浠ｇ爜
+API_TYPE_SYSTEM_LOG = "system_log" # 绯荤粺鏃ュ織
+API_TYPE_GET_FROM_DATA_SERVER = "get_from_data_server" # 浠庢暟鎹湇鍔″櫒鎷夊彇鏁版嵁
class ActionCallback(object):
# 浜ゆ槗
@@ -87,6 +90,12 @@
def OnGetEnvInfo(self, client_id, request_id, data):
pass
+ def OnSyncL2SubscriptCodes(self, client_id, request_id):
+ pass
+
+ def OnGetFromDataServer(self, client_id, request_id, data):
+ pass
+
# 浜ゆ槗鎸囦护绠＄悊
# 浜ゆ槗鎸囦护绠＄悊
@@ -102,7 +111,7 @@
@classmethod
def __create_client(cls, client_type, rid):
client = socket.socket(socket.AF_INET, socket.SOCK_STREAM) # 鐢熸垚socket锛岃繛鎺erver
- client.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, True)
+ # client.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, True)
# client.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 60 * 1000, 30 * 1000))
client.connect(cls.ip_port)
client.send(SendResponseSkManager.format_response(
@@ -180,6 +189,12 @@
cls.action_callback.OnGetCodeTradeState(client_id, request_id, data)
elif content_type == API_TYPE_GET_ENV:
cls.action_callback.OnGetEnvInfo(client_id, request_id, data)
+ elif content_type == API_TYPE_SYNC_L1_TARGET_CODES:
+ cls.action_callback.OnSyncL2SubscriptCodes(client_id, request_id)
+ elif content_type == API_TYPE_SYSTEM_LOG:
+ cls.action_callback.OnSystemLog(client_id, request_id, data)
+ elif content_type == API_TYPE_GET_FROM_DATA_SERVER:
+ cls.action_callback.OnGetFromDataServer(client_id, request_id, data)
except Exception as e:
logging.exception(e)
pass
@@ -206,12 +221,9 @@
def __heart_beats(cls, _type, client_id, sk):
while True:
try:
- sk.send(SendResponseSkManager.format_response(
- json.dumps({"type": "heart", "client_id": client_id}).encode('utf-8')))
+ sk.send(socket_util.load_header(json.dumps({"type": "heart", "client_id": client_id}).encode('utf-8')))
# print("蹇冭烦淇℃伅鍙戦�佹垚鍔�", client_id)
except Exception as e:
- print("蹇冭烦淇℃伅鍙戦�佸け璐�", _type, client_id)
- logging.exception(e)
if _type == CLIENT_TYPE_TRADE:
if client_id in cls.trade_client_dict:
cls.trade_client_dict.pop(client_id)
@@ -237,6 +249,7 @@
@classmethod
def __maintain_client(cls):
+ logger_system.info(f"outside_api __maintain_client 绾跨▼ID:{tool.get_thread_id()}")
while True:
try:
if len(cls.trade_client_dict) < cls.trade_client_count:
--
Gitblit v1.8.0