message consumer add retry failed action

HEF-Sharp · Jul 21, 2022 · 39aa3d9 · 39aa3d9
1 parent 310fb3b
commit 39aa3d9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/src/HEF.XTask.RocketMQ.DependencyInjection/HEF.XTask.RocketMQ.DependencyInjection.csproj b/src/HEF.XTask.RocketMQ.DependencyInjection/HEF.XTask.RocketMQ.DependencyInjection.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>1.2.4</Version>
-    <AssemblyVersion>1.2.4.0</AssemblyVersion>
-    <FileVersion>1.2.4.0</FileVersion>
+    <Version>1.2.5</Version>
+    <AssemblyVersion>1.2.5.0</AssemblyVersion>
+    <FileVersion>1.2.5.0</FileVersion>
     <Authors>wanlitao</Authors>
     <Description>RocketMQ XTask DependencyInjection by HEF</Description>
     <Company>GreatBillows</Company>

diff --git a/src/HEF.XTask.RocketMQ/Consumer/RocketTaskMessageConsumer.cs b/src/HEF.XTask.RocketMQ/Consumer/RocketTaskMessageConsumer.cs
@@ -43,27 +43,32 @@ public async Task<bool> Consume(MQTypedMessage<MessageExt, RocketMessage<TMessag
             if (result)  //延迟任务执行成功，无需其它操作
                 return true;
 
-            if (!scheduleContext.CheckStartRetry())  //没有重试 则直接通知任务执行失败
+            if (!scheduleContext.IsRetrying())  //首次执行失败 通知任务执行失败
             {
                 await OnConsumeFailed(typedMessage.Message, rocketMessage);
-                return true;
             }
 
-            if (scheduleContext.IsRetryEnd())  //重试结束后依然执行失败 才通知任务执行失败
+            if (scheduleContext.CheckStartRetry())
             {
-                await OnConsumeFailed(typedMessage.Message, rocketMessage);
-                return true;
+                if (scheduleContext.IsRetryEnd())  //重试结束后依然执行失败 通知任务重试失败
+                {
+                    await OnRetryFailed(typedMessage.Message, rocketMessage);
+                }
+                else
+                {
+                    //任务执行失败 进行重试
+                    var retryTask = new XRocketTask<TMessageBody>(rocketMessage);
+                    RocketTaskScheduler.Schedule(retryTask, rocketMessage.Context);
+                }
             }
 
-            //任务执行失败 进行重试
-            var retryTask = new XRocketTask<TMessageBody>(rocketMessage);
-            RocketTaskScheduler.Schedule(retryTask, rocketMessage.Context);
-
             return true;
         }
 
         protected abstract Task<bool> Consume(MessageExt messageExt, RocketMessage<TMessageBody> rocketMessage);
 
         protected abstract Task OnConsumeFailed(MessageExt messageExt, RocketMessage<TMessageBody> rocketMessage);
+
+        protected abstract Task OnRetryFailed(MessageExt messageExt, RocketMessage<TMessageBody> rocketMessage);
     }
 }
diff --git a/src/HEF.XTask.RocketMQ/HEF.XTask.RocketMQ.csproj b/src/HEF.XTask.RocketMQ/HEF.XTask.RocketMQ.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>1.2.4</Version>
-    <AssemblyVersion>1.2.4.0</AssemblyVersion>
-    <FileVersion>1.2.4.0</FileVersion>
+    <Version>1.2.5</Version>
+    <AssemblyVersion>1.2.5.0</AssemblyVersion>
+    <FileVersion>1.2.5.0</FileVersion>
     <Authors>wanlitao</Authors>
     <Description>RocketMQ XTask by HEF</Description>
     <Company>GreatBillows</Company>

diff --git a/src/HEF.XTask/HEF.XTask.csproj b/src/HEF.XTask/HEF.XTask.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>1.2.4</Version>
-    <AssemblyVersion>1.2.4.0</AssemblyVersion>
-    <FileVersion>1.2.4.0</FileVersion>
+    <Version>1.2.5</Version>
+    <AssemblyVersion>1.2.5.0</AssemblyVersion>
+    <FileVersion>1.2.5.0</FileVersion>
     <Authors>wanlitao</Authors>
     <Description>XTask by HEF</Description>
     <Company>GreatBillows</Company>