sycommon-python-lib 0.1.57b3__tar.gz → 0.1.57b4__tar.gz

{sycommon_python_lib-0.1.57b3 → sycommon_python_lib-0.1.57b4}/PKG-INFO

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

{sycommon_python_lib-0.1.57b3 → sycommon_python_lib-0.1.57b4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.57b3"
+version = "0.1.57b4"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.1.57b3 → sycommon_python_lib-0.1.57b4}/src/sycommon/rabbitmq/rabbitmq_client.py

@@ -256,6 +256,9 @@ class RabbitMQClient:
             self._message_handler = handler
 
     async def _process_message_callback(self, message: AbstractIncomingMessage):
+        # 定义标志位，记录我们是否需要重试（即业务是否失败）
+        should_retry = False
+
         try:
             msg_obj: MQMsgModel
             if self.auto_parse_json:
@@ -264,8 +267,9 @@ class RabbitMQClient:
                     msg_obj = MQMsgModel(**body_dict)
                 except json.JSONDecodeError as e:
                     logger.error(f"JSON解析失败: {e}")
-                    await message.nack(requeue=False)
-                    return
+                    # 格式错误，无法处理，直接拒绝不重试
+                    await message.reject(requeue=False)
+                    return  # 这里 return 了，不会走下面的 finally
             else:
                 msg_obj = MQMsgModel(
                     body=message.body.decode("utf-8"),
@@ -279,32 +283,48 @@ class RabbitMQClient:
             if self._message_handler:
                 await self._message_handler(msg_obj, message)
 
-            await message.ack()
+            # 如果正常执行到这里，说明业务成功
+            # await message.ack()
+            # 我们移除这里的 ack，统一交给 finally 处理
 
         except Exception as e:
             logger.error(f"消息处理异常: {e}", exc_info=True)
-            headers = dict(message.headers) if message.headers else {}
-            current_retry = int(headers.get("x-retry-count", 0))
+            # 业务异常，标记需要重试
+            should_retry = True
 
-            if current_retry >= 3:
-                logger.warning(f"重试次数超限，丢弃消息: {message.delivery_tag}")
-                await message.reject(requeue=False)
-            else:
-                headers["x-retry-count"] = current_retry + 1
-                try:
-                    new_msg = Message(
-                        body=message.body,
-                        headers=headers,
-                        content_type=message.content_type,
-                        delivery_mode=message.delivery_mode
-                    )
-                    # 这里的 publish 如果失败，会触发重连机制
-                    # 但注意，当前是在回调线程中，建议做好异常捕获
-                    await self._exchange.publish(new_msg, routing_key=message.routing_key)
-                    await message.ack()
-                except Exception as pub_err:
-                    logger.error(f"重试发布失败: {pub_err}")
+        finally:
+            # 【核心修复】无论发生什么，最后都要给 MQ 一个交待
+            if should_retry:
+                headers = dict(message.headers) if message.headers else {}
+                current_retry = int(headers.get("x-retry-count", 0))
+
+                if current_retry >= 3:
+                    logger.warning(f"重试次数超限，丢弃消息: {message.delivery_tag}")
                     await message.reject(requeue=False)
+                else:
+                    headers["x-retry-count"] = current_retry + 1
+                    try:
+                        new_msg = Message(
+                            body=message.body,
+                            headers=headers,
+                            content_type=message.content_type,
+                            delivery_mode=message.delivery_mode
+                        )
+                        # 发送新消息用于重试
+                        await self._exchange.publish(new_msg, routing_key=message.routing_key)
+
+                        # 【关键】新消息发成功了，现在可以安全地 Ack 掉旧消息了
+                        # 这样旧消息才会从队列中移除，避免死循环
+                        await message.ack()
+
+                    except Exception as pub_err:
+                        logger.error(f"重试发布失败，消息将丢失: {pub_err}")
+                        # 发布失败，无法重试，只能丢弃旧消息（或者 Nack requeue=True）
+                        # 为了防止死循环，这里通常建议 Reject (False) 并配置死信队列
+                        await message.reject(requeue=False)
+            else:
+                # 业务正常执行，直接 Ack
+                await message.ack()
 
     async def start_consuming(self) -> Optional[ConsumerTag]:
         if self._closed:

{sycommon_python_lib-0.1.57b3 → sycommon_python_lib-0.1.57b4}/src/sycommon_python_lib.egg-info/PKG-INFO

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