sycommon-python-lib 0.1.12__tar.gz → 0.1.14__tar.gz

{sycommon_python_lib-0.1.12 → sycommon_python_lib-0.1.14}/PKG-INFO

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

{sycommon_python_lib-0.1.12 → sycommon_python_lib-0.1.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.12"
+version = "0.1.14"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"

{sycommon_python_lib-0.1.12 → sycommon_python_lib-0.1.14}/src/sycommon/rabbitmq/rabbitmq_client.py

@@ -481,7 +481,7 @@ class RabbitMQClient:
                                 await self.stop_consuming()
                                 await asyncio.sleep(1)
                                 await self.start_consuming()
-                                logger.info("消费者已重启以恢复消费")
+                                # logger.info("消费者已重启以恢复消费")
                 except Exception as e:
                     logger.error(f"监控任务出错: {str(e)}")
                     await asyncio.sleep(1)

{sycommon_python_lib-0.1.12 → sycommon_python_lib-0.1.14}/src/sycommon/synacos/feign.py

@@ -300,7 +300,7 @@ def feign_client(service_name: str, path_prefix: str = "", default_timeout: floa
                         # 3. 服务发现
                         version = headers.get('s-y-version')
                         instances = self.nacos_manager.get_service_instances(
-                            self.service_name, version=version)
+                            self.service_name, target_version=version)
                         if not instances:
                             raise RuntimeError(
                                 f"未找到服务 {self.service_name} 的健康实例")
@@ -427,7 +427,7 @@ async def feign(service_name, api_path, method='GET', params=None, headers=None,
 
         # 获取服务实例
         instances = nacos_service.get_service_instances(
-            service_name, version=version)
+            service_name, target_version=version)
         if not instances:
             SYLogger.error(f"nacos:未找到 {service_name} 的健康实例")
             return None

{sycommon_python_lib-0.1.12 → sycommon_python_lib-0.1.14}/src/sycommon/synacos/nacos_service.py

@@ -515,7 +515,11 @@ class NacosService(metaclass=SingletonMeta):
                             f"nacos:心跳发送失败，已持续{current_time - self._last_successful_heartbeat:.1f}秒")
                 else:
                     SYLogger.warning("nacos:服务未注册，尝试重新注册")
-                    self._executor.submit(self.register_with_retry)
+                    # 检查线程池是否已关闭
+                    if not self._executor._shutdown:
+                        self._executor.submit(self.register_with_retry)
+                    else:
+                        SYLogger.warning("nacos:线程池已关闭，无法提交注册任务")
             finally:
                 last_heartbeat_time = time.time()  # 更新上次执行时间
 
@@ -650,11 +654,11 @@ class NacosService(metaclass=SingletonMeta):
         finally:
             self._shutdown_event.set()
             # 优雅地关闭线程池
-            if self._executor:
+            if self._executor and not self._executor._shutdown:
                 self._executor.shutdown(wait=True)
-            if self._heartbeat_executor:
+            if self._heartbeat_executor and not self._heartbeat_executor._shutdown:
                 self._heartbeat_executor.shutdown(wait=True)
-            if self._monitor_executor:
+            if self._monitor_executor and not self._monitor_executor._shutdown:
                 self._monitor_executor.shutdown(wait=True)
 
     def handle_signal(self, signum, frame):

{sycommon_python_lib-0.1.12 → sycommon_python_lib-0.1.14}/src/sycommon_python_lib.egg-info/PKG-INFO

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