sycommon-python-lib 0.1.51__tar.gz → 0.1.52__tar.gz

{sycommon_python_lib-0.1.51 → sycommon_python_lib-0.1.52}/PKG-INFO

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

{sycommon_python_lib-0.1.51 → sycommon_python_lib-0.1.52}/pyproject.toml

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

{sycommon_python_lib-0.1.51 → sycommon_python_lib-0.1.52}/src/sycommon/rabbitmq/rabbitmq_client.py

@@ -307,22 +307,29 @@ class RabbitMQClient:
             return self._consumer_tag
 
     async def stop_consuming(self) -> None:
-        """停止消息消费（修复：移除 _queue.is_closed 判断）"""
+        """停止消息消费（适配 RobustChannel）"""
         async with self._consume_lock:
             try:
-                # 判断 consumer_tag 和 queue 是否存在，通道状态通过 _channel 校验
+                # 校验核心条件：消费标签、队列、通道均有效
                 if self._consumer_tag and self._queue and self._channel and not self._channel.is_closed:
-                    # 用通道取消消费（队列无cancel方法）
-                    await self._channel.basic_cancel(self._consumer_tag)
+                    # 使用队列的 cancel 方法（适配 RobustChannel）
+                    await self._queue.cancel(self._consumer_tag)
                     logger.info(
-                        f"停止消费成功，consumer_tag: {self._consumer_tag}，队列: {self._queue.name}")
-                elif self._consumer_tag and self._queue:
-                    # 通道已关闭，无需执行cancel（消费已自动停止）
-                    logger.warning(
-                        f"通道已关闭，无需取消消费（consumer_tag: {self._consumer_tag}）")
+                        f"停止消费成功，consumer_tag: {self._consumer_tag}，队列: {self._queue.name}"
+                    )
+                elif self._consumer_tag:
+                    # 部分资源无效时的日志提示
+                    if not self._queue:
+                        logger.warning(
+                            f"消费标签存在但队列为空，无法取消消费（consumer_tag: {self._consumer_tag}）")
+                    elif not self._channel or self._channel.is_closed:
+                        logger.warning(
+                            f"通道已关闭，消费已自动停止（consumer_tag: {self._consumer_tag}，队列: {self._queue.name if self._queue else '未知'}）"
+                        )
             except Exception as e:
                 logger.error(
-                    f"停止消费者 '{self._queue.name if self._queue else '未知队列'}' 时出错: {str(e)}", exc_info=True)
+                    f"停止消费者 '{self._queue.name if self._queue else '未知队列'}' 时出错: {str(e)}", exc_info=True
+                )
             finally:
                 self._consumer_tag = None  # 无论成败，清理消费标签
 

{sycommon_python_lib-0.1.51 → sycommon_python_lib-0.1.52}/src/sycommon_python_lib.egg-info/PKG-INFO

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