sycommon-python-lib 0.1.51__py3-none-any.whl → 0.1.52__py3-none-any.whl

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.dist-info → sycommon_python_lib-0.1.52.dist-info}/METADATA

@@ -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.dist-info → sycommon_python_lib-0.1.52.dist-info}/RECORD

@@ -35,7 +35,7 @@ sycommon/models/mqlistener_config.py,sha256=vXp2uMmd0XQ5B9noSRXWHewTy-juQ2y7IsWt
 sycommon/models/mqmsg_model.py,sha256=cxn0M5b0utQK6crMYmL-1waeGYHvK3AlGaRy23clqTE,277
 sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6D7I,268
 sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2702
-sycommon/rabbitmq/rabbitmq_client.py,sha256=KUMNklTXK2cc66fNpThnZZpPLwfRH4-AwLQ2rsGEePk,19898
+sycommon/rabbitmq/rabbitmq_client.py,sha256=GkuYILMZJnvgZs4ID46I-w_UGzzI28YUydKgkTIDhIs,20226
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=QtUcK4HuepRqRmy5XkUQo8gDgj74fr77CX7T5rN0y4I,15640
 sycommon/rabbitmq/rabbitmq_service.py,sha256=wpEJynP0gzbnmMyB02sfR9nTWB4hfTTP00xQxDJu644,38119
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -52,8 +52,8 @@ sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/snowflake.py,sha256=DdEj3T5r5OEvikp3puxqmmmz6BrggxomoSlnsRFb5dM,1174
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.51.dist-info/METADATA,sha256=p5snEjLtK9zjIs4a4BySEavEY8FZn7Jw_XI4AtvLy2o,7037
-sycommon_python_lib-0.1.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.51.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.51.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.51.dist-info/RECORD,,
+sycommon_python_lib-0.1.52.dist-info/METADATA,sha256=1ucpOddKw2gFQLUJPp2k_kJZ6M03xqVtvLbPSdnVcGQ,7037
+sycommon_python_lib-0.1.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.52.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.52.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.52.dist-info/RECORD,,