sycommon-python-lib 0.1.33__py3-none-any.whl → 0.1.34__py3-none-any.whl

sycommon/rabbitmq/rabbitmq_client.py

@@ -80,7 +80,7 @@ class RabbitMQClient:
         self._exchange_exists = False
         self._queue_exists = False
         self._queue_bound = False
-        self._is_consuming = False  # 核心消费状态标志
+        self._is_consuming = False
         self._closed = False
         self._consumer_tag: Optional[ConsumerTag] = None
         self._last_activity_timestamp = asyncio.get_event_loop().time()
@@ -98,6 +98,8 @@ class RabbitMQClient:
 
         # 消息处理跟踪
         self._tracking_messages: Dict[str, Dict[str, Any]] = {}
+        # 状态保护锁
+        self._state_lock = asyncio.Lock()
 
     @property
     def is_connected(self) -> bool:
@@ -115,11 +117,12 @@ class RabbitMQClient:
         """更新最后消息处理时间戳"""
         self._last_message_processed = asyncio.get_event_loop().time()
 
-    def _set_is_consuming(self, value: bool) -> None:
-        """安全更新消费状态并记录日志"""
-        if self._is_consuming != value:
-            logger.info(f"消费状态变更: {self._is_consuming} → {value}")
-            self._is_consuming = value
+    async def _set_is_consuming(self, value: bool) -> None:
+        """安全更新消费状态并记录日志（带锁保护）"""
+        async with self._state_lock:
+            if self._is_consuming != value:
+                logger.info(f"消费状态变更: {self._is_consuming} → {value}")
+                self._is_consuming = value
 
     async def _get_channel(self) -> AbstractChannel:
         """从通道池获取通道（使用上下文管理器）"""
@@ -200,7 +203,7 @@ class RabbitMQClient:
         self._exchange_exists = False
         self._queue_exists = False
         self._queue_bound = False
-        self._set_is_consuming(False)  # 连接时先停止消费
+        await self._set_is_consuming(False)
 
         retries = 0
         last_exception = None
@@ -312,7 +315,6 @@ class RabbitMQClient:
                     current_time = asyncio.get_event_loop().time()
                     # 清理消息跟踪记录
                     if self._tracking_messages:
-                        # 1. 清理已确认的消息
                         acked_ids = [
                             msg_id for msg_id, info in self._tracking_messages.items()
                             if info.get('acked', False)
@@ -322,28 +324,38 @@ class RabbitMQClient:
                         if acked_ids:
                             logger.info(f"清理了 {len(acked_ids)} 条已确认消息记录")
 
-                    # 检查消费停滞
+                    # 检查消费停滞（仅当消费状态为 True 时才处理）
                     if self._is_consuming:
                         if current_time - self._last_message_processed > self.consumption_stall_threshold:
                             if self._tracking_messages:
                                 logger.warning(
                                     f"消费停滞，但有 {len(self._tracking_messages)} 个消息正在处理，暂不重启")
                             else:
-                                # 无有效消息，重启消费
                                 logger.info("消费停滞且无消息处理，重启消费")
-                                await self.stop_consuming()
-                                await asyncio.sleep(1)
-                                await self.start_consuming()
-
+                                # 重启消费时增加异常捕获，确保状态回滚
+                                try:
+                                    await self.stop_consuming()
+                                    await asyncio.sleep(1)
+                                    # 重启前检查处理器是否存在
+                                    if self.message_handler:
+                                        await self.start_consuming()
+                                    else:
+                                        logger.error("消费处理器已丢失，无法重启消费")
+                                except Exception as e:
+                                    logger.error(
+                                        f"重启消费失败: {str(e)}", exc_info=True)
+                                    # 回滚状态：标记为未消费，避免一直拒绝消息
+                                    await self._set_is_consuming(False)
                 except Exception as e:
-                    logger.error(f"监控任务出错: {str(e)}")
-                    await asyncio.sleep(1)
+                    logger.error(f"监控任务出错: {str(e)}", exc_info=True)
 
                 await asyncio.sleep(60)
 
         self._monitor_task = asyncio.create_task(monitor())
 
     async def _recreate_channel(self) -> None:
+        # 重建前先标记为未消费
+        await self._set_is_consuming(False)
         try:
             self.channel = await self._get_channel()
             await self.channel.set_qos(prefetch_count=self.prefetch_count)
@@ -353,16 +365,22 @@ class RabbitMQClient:
             if self.queue_name:
                 self.queue = await self.channel.get_queue(self.queue_name)
                 if self.queue and self.exchange:
-                    await self._bind_queue(self.channel, self.queue, self.exchange)
-
-            # 重新开始消费
-            if self.message_handler:
+                    bound = await self._bind_queue(self.channel, self.queue, self.exchange)
+                    if not bound:
+                        raise Exception("队列绑定失败，通道重建不完整")
+
+            # 重新开始消费（确保状态正确恢复）
+            async with self._state_lock:
+                has_handler = self.message_handler is not None
+            if has_handler:
                 await self.start_consuming()
 
             logger.info("通道已重建并恢复服务")
             self._update_activity_timestamp()
         except Exception as e:
-            logger.error(f"通道重建失败: {str(e)}，触发重连")
+            logger.error(f"通道重建失败: {str(e)}，触发重连", exc_info=True)
+            # 重建失败时，确保消费状态为 False
+            await self._set_is_consuming(False)
             await self.connect(force_reconnect=True)
 
     def _start_keepalive(self) -> None:
@@ -422,7 +440,7 @@ class RabbitMQClient:
     async def close(self) -> None:
         """关闭客户端并释放资源"""
         self._closed = True
-        self._set_is_consuming(False)
+        await self._set_is_consuming(False)
 
         # 取消所有任务
         for task in [self._keepalive_task, self._reconnect_task,
@@ -508,16 +526,18 @@ class RabbitMQClient:
 
         raise Exception(f"消息发布失败，经过{retry_count}次重试仍未成功")
 
-    def set_message_handler(self, handler):
-        self.message_handler = handler
+    async def set_message_handler(self, handler):
+        async with self._state_lock:
+            self.message_handler = handler
 
     async def start_consuming(self) -> ConsumerTag:
-        if self._is_consuming:
-            logger.info("已经在消费中，返回现有consumer_tag")
-            if self._consumer_tag:
-                return self._consumer_tag
-            logger.warning("检测到消费状态异常（无consumer_tag），重置状态后重试")
-            self._set_is_consuming(False)
+        async with self._state_lock:
+            if self._is_consuming:
+                logger.info("已经在消费中，返回现有consumer_tag")
+                if self._consumer_tag:
+                    return self._consumer_tag
+                logger.warning("检测到消费状态异常（无consumer_tag），重置状态后重试")
+                self._is_consuming = False
 
         if not self.is_connected:
             await self.connect()
@@ -525,8 +545,9 @@ class RabbitMQClient:
         if not self.queue:
             raise Exception("队列未初始化，无法开始消费")
 
-        if not self.message_handler:
-            raise Exception("未设置消息处理函数")
+        async with self._state_lock:
+            if not self.message_handler:
+                raise Exception("未设置消息处理函数")
 
         try:
             self._consumer_tag = await self.queue.consume(
@@ -537,12 +558,13 @@ class RabbitMQClient:
             if not self._consumer_tag:
                 raise Exception("未能获取到有效的consumer_tag")
 
-            self._set_is_consuming(True)
+            await self._set_is_consuming(True)
             logger.info(
                 f"消费者已启动，队列: {self.actual_queue_name}, tag: {self._consumer_tag}")
             return self._consumer_tag
         except Exception as e:
-            self._set_is_consuming(False)
+            # 异常时强制设置为未消费
+            await self._set_is_consuming(False)
             logger.error(f"启动消费失败: {str(e)}", exc_info=True)
             raise
 
@@ -565,7 +587,7 @@ class RabbitMQClient:
         if not self._is_consuming:
             return
 
-        self._set_is_consuming(False)
+        await self._set_is_consuming(False)
 
         if self._consumer_tag and self.queue:
             await self._safe_cancel_consumer()
@@ -602,10 +624,19 @@ class RabbitMQClient:
             return message.body.decode('utf-8')
 
     async def _message_wrapper(self, message: AbstractIncomingMessage) -> None:
-        if not self.message_handler or not self._is_consuming:
-            logger.warning("未设置消息处理器或已停止消费，拒绝消息，重新放到队列")
+        # 先通过锁获取当前状态，避免并发修改导致的判断错误
+        async with self._state_lock:
+            has_handler = self.message_handler is not None
+            is_consuming = self._is_consuming
+
+        if not has_handler or not is_consuming:
+            logger.warning(
+                f"拒绝消息: message_handler={'存在' if has_handler else '不存在'}, "
+                f"is_consuming={is_consuming}，消息ID: {message.message_id or str(id(message))}"
+            )
             try:
                 await message.reject(requeue=True)
+                await asyncio.sleep(3)
             except Exception as e:
                 logger.error(f"拒绝消息失败: {e}")
             return

sycommon/rabbitmq/rabbitmq_service.py

@@ -443,7 +443,7 @@ class RabbitMQService:
             handler = cls.default_message_handler
 
         # 设置消息处理器
-        client.set_message_handler(handler)
+        await client.set_message_handler(handler)
 
         # 确保客户端已连接
         start_time = asyncio.get_event_loop().time()

{sycommon_python_lib-0.1.33.dist-info → sycommon_python_lib-0.1.34.dist-info}/METADATA

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

{sycommon_python_lib-0.1.33.dist-info → sycommon_python_lib-0.1.34.dist-info}/RECORD

@@ -35,9 +35,9 @@ 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=mI_e8iP2F9_oYMPvrP9wYW5x1wtLPLaxpNJ9719pDs4,27899
+sycommon/rabbitmq/rabbitmq_client.py,sha256=n3c1W31S1NAOkQO2UDpQYgE7Ex8N2hyZrqwPpyxEijU,29733
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=_NMOO4CZy-I_anMqpzfYinz-8373_rg5FM9eqzdjGyU,3598
-sycommon/rabbitmq/rabbitmq_service.py,sha256=fP3kslCL_LfYHeM7D88C8hDFeq00bdipSh4q-LU23mo,30193
+sycommon/rabbitmq/rabbitmq_service.py,sha256=5BrqF_3PwEMbqs8AVhSqFpqzo3GrIftafMX_tCmFv8E,30199
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/sse/event.py,sha256=k_rBJy23R7crtzQeetT0Q73D8o5-5p-eESGSs_BPOj0,2797
 sycommon/sse/sse.py,sha256=__CfWEcYxOxQ-HpLor4LTZ5hLWqw9-2X7CngqbVHsfw,10128
@@ -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.33.dist-info/METADATA,sha256=UfJB9N7EShz-rTDuKzcQcVZ-Wx-4liFN9pgcBONggyk,7037
-sycommon_python_lib-0.1.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.33.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.33.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.33.dist-info/RECORD,,
+sycommon_python_lib-0.1.34.dist-info/METADATA,sha256=8m47X4r_A5oq9e1CjQaBkt5gdRTblwW7qyln8kQzC0c,7037
+sycommon_python_lib-0.1.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.34.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.34.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.34.dist-info/RECORD,,