sycommon-python-lib 0.2.0b22__tar.gz → 0.2.0b23__tar.gz

{sycommon_python_lib-0.2.0b22 → sycommon_python_lib-0.2.0b23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.0b22
+Version: 0.2.0b23
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.0b22 → sycommon_python_lib-0.2.0b23}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.0b22"
+version = "0.2.0b23"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.0b22 → sycommon_python_lib-0.2.0b23}/src/sycommon/rabbitmq/rabbitmq_pool.py

@@ -119,8 +119,8 @@ class RabbitMQConnectionPool:
             self._heartbeat_fail_count = 0
             self._consecutive_success += 1
 
-            # 如果之前发送过告警，需要连续成功3次确认恢复后才发送恢复通知
-            if self._alert_sent and self._consecutive_success >= 3:
+            # 如果之前发送过告警，心跳成功一次即发送恢复通知
+            if self._alert_sent and self._consecutive_success >= 1:
                 self._alert_sent = False
                 saved_reconnect_attempts = self._reconnect_attempts
                 saved_disconnect_count = self._disconnect_count

{sycommon_python_lib-0.2.0b22 → sycommon_python_lib-0.2.0b23}/src/sycommon/synacos/nacos_heartbeat_manager.py

@@ -118,8 +118,9 @@ class NacosHeartbeatManager:
                         SYLogger.info(
                             f"nacos:心跳发送成功 - 间隔: {self.heartbeat_interval}秒, 连续成功: {consecutive_success}次"
                         )
-                        # 恢复后发送通知（需要连续成功3次确认恢复）
-                        if self._alert_sent and consecutive_success >= 3:
+                        # 恢复后发送通知（心跳成功一次即恢复）
+                        if self._alert_sent and consecutive_success >= 1:
+                            SYLogger.info(f"nacos:检测恢复状态 - _alert_sent={self._alert_sent}, consecutive_success={consecutive_success}")
                             self._alert_sent = False
                             SYLogger.info(f"nacos:心跳已稳定恢复，发送恢复通知")
                             send_nacos_alert_sync(
@@ -144,6 +145,7 @@ class NacosHeartbeatManager:
 
                         # 连续失败3次后发送告警（仅发送一次）
                         if consecutive_fail >= 3 and not self._alert_sent:
+                            SYLogger.info(f"nacos:准备发送断开告警 - consecutive_fail={consecutive_fail}, _alert_sent={self._alert_sent}")
                             self._alert_sent = True
                             self._disconnect_count += 1
                             self._alert_fail_count = consecutive_fail  # 记录告警时的失败次数
@@ -235,7 +237,8 @@ class NacosHeartbeatManager:
                 "version": self.registration.version} if self.registration.version else None
         )
 
-        if result and isinstance(result, dict) and result.get('lightBeatEnabled', False):
+        # 心跳成功：只要返回结果就认为成功（不依赖 lightBeatEnabled 字段）
+        if result:
             SYLogger.info(f"nacos:心跳发送成功，Nacos返回: {result}")
             return True
         else:

{sycommon_python_lib-0.2.0b22 → sycommon_python_lib-0.2.0b23}/src/sycommon/synacos/nacos_service_discovery.py

@@ -203,9 +203,17 @@ class NacosServiceDiscovery:
                                 )
                             registration.verify_registration()
                     else:
-                        # 服务正常，重置告警状态
+                        # 服务正常，重置告警状态并发送恢复通知
                         if self._service_alert_sent and current_registered:
                             self._service_alert_sent = False
+                            SYLogger.info(f"nacos:服务已恢复正常，发送恢复通知")
+                            send_nacos_service_alert_sync(
+                                error_msg="服务实例已恢复正常",
+                                service_name=registration.service_name,
+                                host=f"{registration.real_ip}:{registration.port}",
+                                is_service_down=False,
+                                disconnect_count=self._disconnect_count
+                            )
 
                 self.client_base._shutdown_event.wait(check_interval)
 

{sycommon_python_lib-0.2.0b22 → sycommon_python_lib-0.2.0b23}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.0b22
+Version: 0.2.0b23
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown