sycommon-python-lib 0.1.56b6__py3-none-any.whl → 0.1.56b7__py3-none-any.whl

sycommon/synacos/nacos_service.py

@@ -9,7 +9,6 @@ import os
 import yaml
 import time
 import atexit
-import random
 
 from sycommon.config.Config import Config, SingletonMeta
 from sycommon.logging.kafka_log import SYLogger
@@ -30,9 +29,6 @@ class NacosService(metaclass=SingletonMeta):
             self._client_initialized = False  # 客户端初始化状态
             self._shutdown_event = threading.Event()
 
-            # 添加可重入锁用于状态同步
-            self._state_lock = threading.RLock()
-
             # 配置参数
             self.max_retries = self.nacos_config.get('maxRetries', 5)
             self.retry_delay = self.nacos_config.get('retryDelay', 5)
@@ -62,6 +58,15 @@ class NacosService(metaclass=SingletonMeta):
             self.real_ip = self.get_service_ip(self.host)
             self._long_term_retry_count = 0  # 长期重试计数器
 
+            # 监控线程相关
+            self._monitor_thread_started = False
+            self._monitor_thread_lock = threading.Lock()
+            self._state_lock = threading.RLock()
+
+            # 验证相关
+            self._verify_lock = threading.Lock()
+            self._last_verify_time = 0
+
             # 轮询索引，用于在所有实例中进行轮询选择
             self._round_robin_index = 0
             self._round_robin_lock = threading.Lock()  # 保护轮询索引的线程安全
@@ -90,7 +95,6 @@ class NacosService(metaclass=SingletonMeta):
 
             self.max_heartbeat_timeout = self.nacos_config.get(
                 'maxHeartbeatTimeout', 30)
-            self._last_successful_heartbeat = time.time()
             # 连接监控检查间隔（新增配置，默认30秒，避免硬编码）
             self.connection_check_interval = self.nacos_config.get(
                 'connectionCheckInterval', 30)
@@ -259,28 +263,50 @@ class NacosService(metaclass=SingletonMeta):
             return False
 
     def verify_registration(self):
-        """多次验证服务是否成功注册"""
-        success_count = 0
-        SYLogger.info(
-            f"nacos:开始验证服务注册状态，共验证 {self.registration_verify_count} 次")
+        """多次验证服务是否成功注册（加锁防止重复执行）"""
+        # 新增：线程级别的单次执行锁（避免同一轮循环重复调用）
+        if self._verify_lock.locked():
+            SYLogger.warning("nacos:注册验证已在执行中，跳过重复调用")
+            return self.registered
+
+        with self._verify_lock:
+            # 冷却时间控制（避免短时间重复验证，15秒内不重复）
+            current_time = time.time()
+            if current_time - self._last_verify_time < self.heartbeat_interval:
+                return True
 
-        for i in range(self.registration_verify_count):
-            if self.check_service_registered():
-                success_count += 1
-            else:
-                SYLogger.warning(f"nacos:第 {i+1} 次验证未找到注册实例")
+            success_count = 0
+            verify_count = self.registration_verify_count
+            SYLogger.info(
+                f"nacos:开始验证服务注册状态，共验证 {verify_count} 次，间隔 {self.registration_verify_interval} 秒")
 
-            if i < self.registration_verify_count - 1:
-                time.sleep(self.registration_verify_interval)
+            self._last_verify_time = current_time  # 更新最后验证时间
 
-        if success_count >= self.registration_verify_count / 2:
-            SYLogger.info(
-                f"nacos:服务注册验证成功，{success_count}/{self.registration_verify_count} 次验证通过")
-            return True
-        else:
-            SYLogger.error(
-                f"nacos:服务注册验证失败，仅 {success_count}/{self.registration_verify_count} 次验证通过")
-            return False
+            for i in range(verify_count):
+                # 调用去重后的 check_service_registered
+                if self.check_service_registered():
+                    success_count += 1
+
+                if i < verify_count - 1:
+                    # 可中断的等待，替代 sleep
+                    self._shutdown_event.wait(
+                        self.registration_verify_interval)
+                    if self._shutdown_event.is_set():
+                        SYLogger.warning("nacos:应用正在关闭，终止注册验证")
+                        break
+
+            # 验证结果判断
+            pass_threshold = verify_count / 2
+            result = success_count >= pass_threshold
+
+            if result:
+                SYLogger.info(
+                    f"nacos:服务注册验证成功，{success_count}/{verify_count} 次验证通过")
+            else:
+                SYLogger.error(
+                    f"nacos:服务注册验证失败，仅 {success_count}/{verify_count} 次验证通过")
+
+            return result
 
     def register_with_retry(self):
         """带重试机制的服务注册（基于实例列表检查）"""
@@ -517,11 +543,10 @@ class NacosService(metaclass=SingletonMeta):
                         f"nacos:服务未注册，跳过心跳 - 线程ID: {thread_ident}")
                     consecutive_fail = 0
                 else:
-                    # 发送心跳（10秒超时）
+                    # 发送心跳（15秒超时）
                     success = self.send_heartbeat()
                     if success:
                         consecutive_fail = 0
-                        self._last_successful_heartbeat = current_time
                         SYLogger.info(
                             f"nacos:心跳发送成功 - 时间: {current_time:.3f}, "
                             f"间隔: {self.heartbeat_interval}秒"
@@ -541,16 +566,12 @@ class NacosService(metaclass=SingletonMeta):
                 SYLogger.error(
                     f"nacos:心跳异常: {str(e)}, 连续失败: {consecutive_fail}次")
 
-            # 计算下次执行时间（当前时间 + 配置间隔），确保间隔稳定
-            next_run_time = current_time + self.heartbeat_interval
-            sleep_time = max(0, next_run_time - time.time()
-                             )  # 避免负数（处理耗时超过间隔的情况）
-            self._shutdown_event.wait(sleep_time)  # 精准休眠至下次执行时间
+            self._shutdown_event.wait(self.heartbeat_interval)
 
         SYLogger.info(f"nacos:心跳循环已停止 - 线程ID: {thread_ident}")
 
     def send_heartbeat(self):
-        """发送心跳并添加10秒超时控制（替换线程池实现）"""
+        """发送心跳并添加10秒超时控制（仅保留核心逻辑，移除重复日志）"""
         if not self.ensure_client_connected():
             SYLogger.warning("nacos:客户端未连接，心跳发送失败")
             return False
@@ -585,9 +606,6 @@ class NacosService(metaclass=SingletonMeta):
             self._client_initialized = False  # 强制重连
             return False
 
-        # 检查心跳结果
-        if result_list[0]:
-            self._last_successful_heartbeat = time.time()
         return result_list[0]
 
     def _send_heartbeat_internal(self):
@@ -616,59 +634,60 @@ class NacosService(metaclass=SingletonMeta):
         return self.ensure_client_connected()
 
     def monitor_connection(self):
-        """优化的连接监控线程，缩短检查间隔"""
+        """优化的连接监控线程（彻底去重）"""
+        # 单例锁：防止重复启动
+        with self._monitor_thread_lock:
+            if self._shutdown_event.is_set() or self._monitor_thread_started:
+                SYLogger.warning("nacos:监控线程已启动/已关闭，拒绝重复启动")
+                return
+            self._monitor_thread_started = True
+
         check_interval = self.connection_check_interval
-        thread_start_time = time.time()
-        check_counter = 0
+        SYLogger.info(
+            f"nacos:连接监控线程启动 - 线程ID: {threading.current_thread().ident}")
 
         while not self._shutdown_event.is_set():
             try:
-                current_time = time.time()
-
-                SYLogger.info(
-                    f"nacos:连接监控线程运行中，检查间隔: {check_interval}s")
-
-                # 检查客户端连接状态
-                if not self.ensure_client_connected():
-                    SYLogger.warning("nacos:检测到Nacos客户端连接丢失，尝试重新初始化")
-                    self._initialize_client()  # 尝试重新初始化客户端
-
-                # 检查服务注册状态
-                current_registered = self.check_service_registered()
-
-                # 带锁更新注册状态
-                with self._state_lock:
-                    if current_registered != self.registered:
-                        if current_registered:
-                            self.registered = True
-                            SYLogger.info(f"nacos:服务实例已重新注册")
-                        else:
-                            self.registered = False
-                            SYLogger.warning(f"nacos:服务实例未注册，尝试重新注册")
-                            # 启动临时线程执行重新注册（替换原线程池）
-                            retry_thread = threading.Thread(
-                                target=self.register_with_retry,
-                                daemon=True,
-                                name="NacosRetryRegisterThread"
-                            )
-                            retry_thread.start()
-
-                # 20%的概率执行深度检查
-                if random.random() < 0.2:
-                    self.verify_registration()
-
-                # 每小时重置一次内部状态
-                if current_time - thread_start_time > 3600:
-                    SYLogger.info("nacos:连接监控线程已运行1小时，重置内部状态")
-                    thread_start_time = current_time
-                    check_counter = 0
-
-                check_counter += 1
-                # 休眠指定时间
+                # 步骤1：检查客户端连接（仅在连接断开时重试）
+                if not self._client_initialized:
+                    SYLogger.warning("nacos:客户端未连接，尝试重新初始化")
+                    self.ensure_client_connected()
+                else:
+                    # 步骤2：检查注册状态（仅检查一次，不重复调用）
+                    current_registered = self.check_service_registered()
+
+                    # 步骤3：仅在注册状态变化时，才触发验证+重新注册
+                    with self._state_lock:
+                        if current_registered != self.registered:
+                            self.registered = current_registered
+                            if not current_registered:
+                                SYLogger.warning("nacos:服务实例未注册，触发单次重新注册")
+                                # 启动单次重试线程（非循环）
+                                retry_thread = threading.Thread(
+                                    target=self.register,
+                                    args=(True,),
+                                    daemon=True,
+                                    name="NacosSingleRetryThread"
+                                )
+                                retry_thread.start()
+                            else:
+                                # 仅在「从未注册→已注册」时验证一次
+                                SYLogger.info("nacos:服务实例已注册，触发单次验证")
+                                self.verify_registration()
+
+                # 优化2：固定休眠，避免逻辑耗时导致的间隔混乱
                 self._shutdown_event.wait(check_interval)
+
             except Exception as e:
-                SYLogger.error(f"nacos:连接监控异常: {e}")
-                time.sleep(self.retry_delay)
+                SYLogger.error(f"nacos:连接监控异常: {str(e)}")
+                # 异常时缩短休眠，快速恢复
+                self._shutdown_event.wait(5)
+
+        # 线程退出重置标记
+        with self._monitor_thread_lock:
+            self._monitor_thread_started = False
+        SYLogger.info(
+            f"nacos:连接监控线程退出 - 线程ID: {threading.current_thread().ident}")
 
     def get_service_ip(self, config_ip):
         """获取服务实际IP地址"""

{sycommon_python_lib-0.1.56b6.dist-info → sycommon_python_lib-0.1.56b7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.56b6
+Version: 0.1.56b7
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -21,6 +21,7 @@ Requires-Dist: psutil>=7.1.3
 Requires-Dist: pydantic>=2.12.5
 Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pyyaml>=6.0.3
+Requires-Dist: sentry-sdk[fastapi]>=2.48.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.45
 Requires-Dist: starlette>=0.50.0
 Requires-Dist: uvicorn>=0.40.0

{sycommon_python_lib-0.1.56b6.dist-info → sycommon_python_lib-0.1.56b7.dist-info}/RECORD

@@ -1,12 +1,13 @@
 command/cli.py,sha256=bP2LCLkRvfETIwWkVD70q5xFxMI4D3BpH09Ws1f-ENc,5849
 sycommon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/services.py,sha256=pioA4E2RrV6nyAY8EuETUt4mKzCYoxD1rTMYCcppqjE,11581
-sycommon/config/Config.py,sha256=XWXcE_6RaoB9og0Q6ylQs4oW-lX9mhblr-wWq7S2dVY,3157
+sycommon/services.py,sha256=vcO2vbe2U1CA4ykLdH1rnxgqUIouukE-wTRsjRl2kBI,11683
+sycommon/config/Config.py,sha256=-LzOgnpA0GKgNexG-tmpLspkJipjtq2GcToaZbyGncg,3854
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
 sycommon/config/EmbeddingConfig.py,sha256=gPKwiDYbeu1GpdIZXMmgqM7JqBIzCXi0yYuGRLZooMI,362
 sycommon/config/LLMConfig.py,sha256=yU-aIqePIeF6msfRVEtGq7SXZVDfHyTi6JduKjhMO_4,371
 sycommon/config/MQConfig.py,sha256=_RDcmIdyWKjmgM5ZnriOoI-DpaxgXs7CD0awdAD6z88,252
 sycommon/config/RerankerConfig.py,sha256=35sVwzus2IscvTHnCG63Orl2pC-pMsrVi6wAGDmOH3U,341
+sycommon/config/SentryConfig.py,sha256=OsLb3G9lTsCSZ7tWkcXWJHmvfILQopBxje5pjnkFJfo,320
 sycommon/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/database/async_base_db_service.py,sha256=w6ONUiTtF4-bXRnkBt9QpL9BAy0XUDbQG7F9Hf2rfjw,1337
 sycommon/database/async_database_service.py,sha256=4Ag5PH6DFEcJOXR8MRF9V_Jho5uCoU9Ibo3PqulDsXw,3916
@@ -23,7 +24,7 @@ sycommon/llm/llm_logger.py,sha256=n4UeNy_-g4oHQOsw-VUzF4uo3JVRLtxaMp1FcI8FiEo,54
 sycommon/llm/llm_tokens.py,sha256=-udDyFcmyzx6UAwIi6_d_wwI5kMd5w0-WcS2soVPQxg,4309
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/logging/async_sql_logger.py,sha256=_OY36XkUm__U3NhMgiecy-qd-nptZ_0gpE3J8lGAr58,2619
-sycommon/logging/kafka_log.py,sha256=sVw-dFZKEgCosjSUqgTj7YrpK-ggXhleZFwMUVhl-K0,21416
+sycommon/logging/kafka_log.py,sha256=1pUZ0N4FPRsTpg8PEY27iIa3xAMiLKYLBM3PDV804Lo,9934
 sycommon/logging/logger_levels.py,sha256=_-uQ_T1N8NkNgcAmLrMmJ83nHTDw5ZNvXFPvdk89XGY,1144
 sycommon/logging/logger_wrapper.py,sha256=TiHsrIIHiQMzXgXK12-0KIpU9GhwQJOoHslakzmq2zc,357
 sycommon/logging/sql_logger.py,sha256=aEU3OGnI_51Tjyuuf4FpUi9KPTceFRuKAOyQbPzGhzM,2021
@@ -31,12 +32,12 @@ sycommon/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 sycommon/middleware/context.py,sha256=sc1UjN55dYww2tT9KdFMJV8mgpGro67SnETzbVzty-s,155
 sycommon/middleware/cors.py,sha256=0B5d_ovD56wcH9TfktRs88Q09R9f8Xx5h5ALWYvE8Iw,600
 sycommon/middleware/docs.py,sha256=bVdDBIHXGVBv562MQLSroa1DgHoObxR9gFzv71PIejg,1187
-sycommon/middleware/exception.py,sha256=Bk8IchNND1wg6tUX9hf4xWeEJhvA-E_zE9ysBpRZrqE,3010
+sycommon/middleware/exception.py,sha256=UAy0tKijI_2JoKjwT3h62aL-tybftP3IETvcr26NOao,2883
 sycommon/middleware/middleware.py,sha256=SzZ4wufSNdwC4Ppw99TE7a6AVGkrZRc55NHSrA3PiC8,1447
 sycommon/middleware/monitor_memory.py,sha256=pYRK-wRuDd6enSg9Pf8tQxPdYQS6S0AyjyXeKFRLKEs,628
 sycommon/middleware/mq.py,sha256=4wBqiT5wJGcrfjk2GSr0_U3TStBxoNpHTzcRxVlMEHE,183
-sycommon/middleware/timeout.py,sha256=fImlAPLm4Oa8N9goXtT_0os1GZPCi9F92OgXU81DgDU,656
-sycommon/middleware/traceid.py,sha256=0WYLV5PR6sGeqhLdviHYW94UhUC7NJua2g5HWf2Zhbc,13447
+sycommon/middleware/timeout.py,sha256=RLMzGMrzK14zsf8x-hmUW1DXWezETB0ZY8mpr9EKsos,740
+sycommon/middleware/traceid.py,sha256=SmA9qsqMQeuGGog9xDHzXgJFhm8UxCkXEkxalaAt4hg,13121
 sycommon/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/models/base_http.py,sha256=EICAAibx3xhjBsLqm35Mi3DCqxp0FME4rD_3iQVjT_E,3051
 sycommon/models/log.py,sha256=rZpj6VkDRxK3B6H7XSeWdYZshU8F0Sks8bq1p6pPlDw,500
@@ -45,10 +46,12 @@ sycommon/models/mqmsg_model.py,sha256=cxn0M5b0utQK6crMYmL-1waeGYHvK3AlGaRy23clqT
 sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6D7I,268
 sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2702
 sycommon/notice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/notice/uvicorn_monitor.py,sha256=NRQVWs3jzZq9IY0M55s7LvOKtacsNpfCGGzH5071dGw,7181
+sycommon/notice/uvicorn_monitor.py,sha256=VryQYcAtjijJuGDBimbVurgwxlsLaLtkNnABPDY5Tao,7332
 sycommon/rabbitmq/rabbitmq_client.py,sha256=jClUm9Ao9vZ2IZg7IXIEaDbYYnV8qtmtm77vdmwpKE4,22599
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=5ruFVViSCKA7ToZmR2dZIkP0zT0ZcfsnkSGbrdkg0Tk,16141
-sycommon/rabbitmq/rabbitmq_service.py,sha256=yMNO2N3SxmkPs7jsyqja9EeDsirlxo_zJLDTHlwYB7A,39058
+sycommon/rabbitmq/rabbitmq_service.py,sha256=RkEWzCu2DkjV6G-hZ8FQTdewvkBiPAZezrO7GzKBkiI,39046
+sycommon/sentry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sycommon/sentry/sy_sentry.py,sha256=S2Np_6WmWkI9X76Q67RWZthhCz02tKCfvdhKI57587w,1373
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/sse/event.py,sha256=k_rBJy23R7crtzQeetT0Q73D8o5-5p-eESGSs_BPOj0,2797
 sycommon/sse/sse.py,sha256=__CfWEcYxOxQ-HpLor4LTZ5hLWqw9-2X7CngqbVHsfw,10128
@@ -57,15 +60,15 @@ sycommon/synacos/example.py,sha256=61XL03tU8WTNOo3FUduf93F2fAwah1S0lbH1ufhRhRk,5
 sycommon/synacos/example2.py,sha256=adUaru3Hy482KrOA17DfaC4nwvLj8etIDS_KrWLWmCU,4811
 sycommon/synacos/feign.py,sha256=frB3D5LeFDtT3pJLFOwFzEOrNAJKeQNGk-BzUg9T3WM,8295
 sycommon/synacos/feign_client.py,sha256=ExO7Pd5B3eFKDjXqBRc260K1jkI49IYguLwJJaD2R-o,16166
-sycommon/synacos/nacos_service.py,sha256=9cW2tSjm0vuYFRMPR_cl_EOZPe4axQDCUBcVxoGdPKM,36180
+sycommon/synacos/nacos_service.py,sha256=8RFvOpeKFqYDj1kzzdjZqBBUZMf_VcFeIyeO9uPf_AU,37194
 sycommon/synacos/param.py,sha256=KcfSkxnXOa0TGmCjY8hdzU9pzUsA8-4PeyBKWI2-568,1765
 sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/merge_headers.py,sha256=HV_i52Q-9se3SP8qh7ZGYl8bP7Fxtal4CGVkyMwEdM8,4373
 sycommon/tools/snowflake.py,sha256=lVEe5mNCOgz5OqGQpf5_nXaGnRJlI2STX2s-ppTtanA,11947
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.56b6.dist-info/METADATA,sha256=LeQQG3OiyqTXd1H5AHtmaHXIut9tS3L3swY-a9FkSIs,7226
-sycommon_python_lib-0.1.56b6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.56b6.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.56b6.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.56b6.dist-info/RECORD,,
+sycommon_python_lib-0.1.56b7.dist-info/METADATA,sha256=LNeEx8_l2ZYTYjb3NE5Uh8Epgrywk-O_p4zt6_JNy-k,7269
+sycommon_python_lib-0.1.56b7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.56b7.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.56b7.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.56b7.dist-info/RECORD,,