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

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

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

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

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

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

@@ -53,7 +53,7 @@ class RabbitMQClient:
             self.exchange_type = ExchangeType(exchange_type.lower())
         except ValueError:
             logger.warning(f"无效的exchange_type: {exchange_type}，默认使用'topic'")
-            self.exchange_type = ExchangeType.TOPIC.name.lower()
+            self.exchange_type = ExchangeType.TOPIC
 
         # 队列配置
         self.queue_name = queue_name.strip() if queue_name else None
@@ -176,10 +176,6 @@ class RabbitMQClient:
                     self._channel_conn.close_callbacks.add(
                         self._conn_close_callback)
 
-                # 单通道池已设置prefetch_count，无需重复设置
-                logger.debug(f"使用连接池预配置的prefetch_count")
-
-                # 默认启用异步发布确认
                 # 重建交换机/队列资源
                 await self._rebuild_resources()
 
@@ -311,16 +307,31 @@ class RabbitMQClient:
             return self._consumer_tag
 
     async def stop_consuming(self) -> None:
-        """停止消息消费"""
+        """停止消息消费（适配 RobustChannel）"""
         async with self._consume_lock:
             try:
-                if self._consumer_tag and self._queue and not self._queue.is_closed:
+                # 校验核心条件：消费标签、队列、通道均有效
+                if self._consumer_tag and self._queue and self._channel and not self._channel.is_closed:
+                    # 使用队列的 cancel 方法（适配 RobustChannel）
                     await self._queue.cancel(self._consumer_tag)
-                    logger.info(f"停止消费成功，consumer_tag: {self._consumer_tag}")
+                    logger.info(
+                        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"停止消费失败: {str(e)}", exc_info=True)
+                logger.error(
+                    f"停止消费者 '{self._queue.name if self._queue else '未知队列'}' 时出错: {str(e)}", exc_info=True
+                )
             finally:
-                self._consumer_tag = None
+                self._consumer_tag = None  # 无论成败，清理消费标签
 
     async def publish(
         self,

{sycommon_python_lib-0.1.50 → sycommon_python_lib-0.1.52}/src/sycommon/services.py

@@ -70,7 +70,7 @@ class Services(metaclass=SingletonMeta):
         app.state.config = {
             "host": cls._config.get('Host', '0.0.0.0'),
             "port": cls._config.get('Port', 8080),
-            "workers": cls._config.get('Workers', 2),
+            "workers": cls._config.get('Workers', 1),
             "h11_max_incomplete_event_size": cls._config.get('H11MaxIncompleteEventSize', 1024 * 1024 * 10)
         }
 

{sycommon_python_lib-0.1.50 → 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.50
+Version: 0.1.52
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown