日志修改

Administrator

2024-03-22 c4b481069c464ba7e24e244cb7b24654864d3ec6

日志修改

 huaxin_client/command_manager.py

@@ -74,7 +74,7 @@
    def init(cls, trade_action_callback: TradeActionCallback,
             queue_strategy_trade_read_for_trade: multiprocessing.Queue):
        cls.action_callback = trade_action_callback
        cls.queue_strategy_trade_read = queue_strategy_trade_read_for_trade
        cls.queue_strategy_w_trade_r = queue_strategy_trade_read_for_trade

    @classmethod
    def process_command(cls, _type, client_id, result_json, sk=None):
@@ -129,10 +129,10 @@
    # 维护连接数的稳定
    def run(self, blocking=True):
        if blocking:
            self.run_process_command(self.queue_strategy_trade_read)
            self.run_process_command(self.queue_strategy_w_trade_r)
        else:
            # 接受命令
            t1 = threading.Thread(target=lambda: self.run_process_command(self.queue_strategy_trade_read), daemon=True)
            t1 = threading.Thread(target=lambda: self.run_process_command(self.queue_strategy_w_trade_r), daemon=True)
            t1.start()



 huaxin_client/trade_client.py

@@ -537,6 +537,7 @@
    def OnRspUserLogin(self, pRspUserLoginField: "CTORATstpRspUserLoginField", pRspInfoField: "CTORATstpRspInfoField",
                       nRequestID: "int") -> "void":
        if pRspInfoField.ErrorID == 0:
            logger_local_huaxin_trade_debug.info("交易登录成功")
            logger.info('Login success! [%d]' % nRequestID)
            self.__front_id = pRspUserLoginField.FrontID
            self.__session_id = pRspUserLoginField.SessionID
@@ -1109,20 +1110,20 @@
addr, port = constant.SERVER_IP, constant.SERVER_PORT


def run(queue_strategy_trade_write_=None, queue_strategy_trade_read=None):
def run(queue_strategy_r_trade_w=None, queue_strategy_w_trade_r=None):
    try:
        logger_system.info("交易进程ID：{}", os.getpid())
        logger_system.info(f"trade 线程ID:{tool.get_thread_id()}")
        __init_trade_data_server()

        global queue_strategy_trade_write
        queue_strategy_trade_write = queue_strategy_trade_write_
        queue_strategy_trade_write = queue_strategy_r_trade_w
        # 运行日志同步
        threading.Thread(target=lambda: async_log_util.run_sync(), daemon=True).start()

        global tradeCommandManager
        tradeCommandManager = command_manager.TradeCommandManager()
        tradeCommandManager.init(MyTradeActionCallback(), queue_strategy_trade_read)
        tradeCommandManager.init(MyTradeActionCallback(), queue_strategy_w_trade_r)
        logger_system.info("华鑫交易服务启动")
        tradeCommandManager.run()
    except Exception as e:
@@ -1131,21 +1132,3 @@
    # tradeCommandManager.run()
    while True:
        time.sleep(2)


if __name__ == "__main__":
    # 测试
    # try:
    #     ip_port = ("127.0.0.1", 10008)  # server地址和端口号（最好是10000以后）
    #     client = socket.socket(family=socket.AF_INET, type=socket.SOCK_STREAM)  # 生成socket，连接server
    #     client.connect(ip_port)
    #     client.sendall("111111111111111111111111111111111111111".encode("utf-8"))
    # except Exception as e:
    #     logging.exception(e)
    #     print("远程服务器访问失败", str(e))
    #
    # while True:
    #     time.sleep(1)

    run()
    input()