From 3e590ebfe657b644bdb0de04c2484fef7fc3ee63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=AC=E9=97=B4=E7=99=BD=E7=8C=AB?=
 <139044047+honmashironeko@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:53:09 +0800
Subject: [PATCH] Update

---
 ProxyCat.py        | 11 +++++++----
 modules/modules.py | 12 ++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ProxyCat.py b/ProxyCat.py
index 1a69566..91174d9 100644
--- a/ProxyCat.py
+++ b/ProxyCat.py
@@ -117,6 +117,7 @@ class ProxyCat:
 
         signal.signal(signal.SIGINT, self.handle_shutdown)
         signal.signal(signal.SIGTERM, self.handle_shutdown)
+        self.language = config.get('language', 'cn').lower()
 
     async def start_server(self):
         try:
@@ -125,16 +126,18 @@ class ProxyCat:
                 self.config.get('SERVER', 'host'),
                 self.config.get('SERVER', 'port')
             )
-            print(f"代理服务器运行在 {self.config.get('SERVER', 'host')}:{self.config.get('SERVER', 'port')}")
+            logging.info(get_message('server_running', self.language,
+                self.config.get('SERVER', 'host'),
+                self.config.get('SERVER', 'port')))
             
             async with server:
                 await server.serve_forever()
         except Exception as e:
-            print(f"服务器启动错误: {e}")
+            logging.error(get_message('server_start_error', self.language, e))
             sys.exit(1)
 
     def handle_shutdown(self, signum, frame):
-        print("\n正在关闭服务器...")
+        logging.info(get_message('server_shutting_down', self.language))
         self.running = False
         self.executor.shutdown(wait=True)
         sys.exit(0)
@@ -148,7 +151,7 @@ class ProxyCat:
                 writer
             )
         except Exception as e:
-            print(f"处理客户端请求时出错: {e}")
+            logging.error(get_message('client_process_error', self.language, e))
         finally:
             try:
                 writer.close()
diff --git a/modules/modules.py b/modules/modules.py
index dd986ba..09fbc42 100644
--- a/modules/modules.py
+++ b/modules/modules.py
@@ -74,7 +74,11 @@ MESSAGES = {
         'invalid_proxy': '当前代理无效: {}',
         'proxy_switched': '已从代理 {} 切换到 {}',
         'whitelist_error': '添加白名单失败: {}',
-        'api_mode_notice': '当前为API模式，收到请求将自动获取代理地址'
+        'api_mode_notice': '当前为API模式，收到请求将自动获取代理地址',
+        'server_running': '代理服务器运行在 {}:{}',
+        'server_start_error': '服务器启动错误: {}',
+        'server_shutting_down': '正在关闭服务器...',
+        'client_process_error': '处理客户端请求时出错: {}',
     },
     'en': {
         'getting_new_proxy': 'Getting new proxy IP',
@@ -147,7 +151,11 @@ MESSAGES = {
         'invalid_proxy': 'Current proxy is invalid: {}',
         'proxy_switched': 'Switched from proxy {} to {}',
         'whitelist_error': 'Failed to add whitelist: {}',
-        'api_mode_notice': 'Currently in API mode, proxy address will be automatically obtained upon request'
+        'api_mode_notice': 'Currently in API mode, proxy address will be automatically obtained upon request',
+        'server_running': 'Proxy server running at {}:{}',
+        'server_start_error': 'Server startup error: {}',
+        'server_shutting_down': 'Shutting down server...',
+        'client_process_error': 'Error processing client request: {}',
     }
 }