From b217ca6db84c273f0d1c24eed3fae6bec2431dbe Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 31 八月 2023 10:39:53 +0800
Subject: [PATCH] 添加系统日志

---
 main.py |   58 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/main.py b/main.py
index 7cdbfc7..68fe264 100644
--- a/main.py
+++ b/main.py
@@ -42,11 +42,13 @@
     t1.start()
 
     # 鍚姩L2璁㈤槄鏈嶅姟
-    t1 = threading.Thread(target=huaxin_client.l2_client.run, args=(ptl2_l2, psl2_l2, trade_server.my_l2_data_callback), daemon=True)
+    t1 = threading.Thread(target=huaxin_client.l2_client.run, args=(ptl2_l2, psl2_l2, trade_server.my_l2_data_callback),
+                          daemon=True)
     t1.start()
 
     # 鍚姩鍗庨懌浜ゆ槗鏈嶅姟
-    t1 = threading.Thread(target=huaxin_client.trade_client.run, args=(trade_server.my_trade_response, ptl2_trade, pst_trade),
+    t1 = threading.Thread(target=huaxin_client.trade_client.run,
+                          args=(trade_server.my_trade_response, ptl2_trade, pst_trade),
                           daemon=True)
     t1.start()
 
@@ -78,31 +80,35 @@
 
 
 if __name__ == '__main__':
-    logger_l2_trade.info("鍚姩绋嬪簭")
-    logger_system.info("鍚姩绋嬪簭--------")
-    log.close_print()
-    # 绛栫暐涓巗erver闂寸殑閫氫俊
-    pss_server, pss_strategy = multiprocessing.Pipe()
-    # 绛栫暐涓庝氦鏄撻棿鐨勯�氫俊
-    pst_trade, pst_strategy = multiprocessing.Pipe()
-    # 浜ゆ槗涓巐2涔嬮棿鐨勯�氫俊
-    ptl2_trade, ptl2_l2 = multiprocessing.Pipe()
-    # 绛栫暐涓巐2涔嬮棿鐨勯�氫俊
-    psl2_strategy, psl2_l2 = multiprocessing.Pipe()
+    try:
+        logger_l2_trade.info("鍚姩绋嬪簭")
+        logger_system.info("鍚姩绋嬪簭--------")
+        log.close_print()
+        # 绛栫暐涓巗erver闂寸殑閫氫俊
+        pss_server, pss_strategy = multiprocessing.Pipe()
+        # 绛栫暐涓庝氦鏄撻棿鐨勯�氫俊
+        pst_trade, pst_strategy = multiprocessing.Pipe()
+        # 浜ゆ槗涓巐2涔嬮棿鐨勯�氫俊
+        ptl2_trade, ptl2_l2 = multiprocessing.Pipe()
+        # 绛栫暐涓巐2涔嬮棿鐨勯�氫俊
+        psl2_strategy, psl2_l2 = multiprocessing.Pipe()
 
-    # l1涓庣瓥鐣ラ棿鐨勯�氫俊
-    pl1t_l1, pl1t_strategy = multiprocessing.Pipe()
+        # l1涓庣瓥鐣ラ棿鐨勯�氫俊
+        pl1t_l1, pl1t_strategy = multiprocessing.Pipe()
 
-    # 鎵樼鐜涓嬩笉鍒涘缓
-    # serverProcess = multiprocessing.Process(target=createServer, args=(pss_server,))
-    # serverProcess.start()
-    logger_system.info("涓昏繘绋婭D锛歿}", os.getpid())
+        # 鎵樼鐜涓嬩笉鍒涘缓
+        # 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,ptl2_l2, psl2_l2,ptl2_trade,pst_trade))
-    tradeServerProcess.start()
+        # L1璁㈤槄鏁版嵁
+        l1Process = multiprocessing.Process(target=huaxin_client.l1_client.run, args=(pl1t_l1,))
+        l1Process.start()
 
-    # L1璁㈤槄鏁版嵁
-    huaxin_client.l1_client.run(pl1t_l1)
-    # 灏唗radeServer浣滀负涓昏繘绋�
-    tradeServerProcess.join()
+        # 涓昏繘绋�
+        createTradeServer(pss_strategy, pst_strategy, pl1t_strategy, psl2_strategy, ptl2_l2, psl2_l2, ptl2_trade, pst_trade)
+
+        # 灏唗radeServer浣滀负涓昏繘绋�
+        l1Process.join()
+    except Exception as e:
+        logger_system.exception(e)

--
Gitblit v1.8.0