From 65b7891deb36dd64cc4a24daf75b5ceac7b36dc2 Mon Sep 17 00:00:00 2001
From: 丁松杰 <377973147@qq.com>
Date: Tue, 11 Feb 2020 09:26:16 +0800
Subject: [PATCH] 修复 写入 错误队列后 没有 ack

---
 src/Pole.Core/Consts.cs                                | 1 -
 src/Pole.EventBus.Rabbitmq/Consumer/ConsumerManager.cs | 1 -
 src/Pole.EventBus.Rabbitmq/Consumer/ConsumerRunner.cs  | 8 ++++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Pole.Core/Consts.cs b/src/Pole.Core/Consts.cs
index 373af80..03081e2 100644
--- a/src/Pole.Core/Consts.cs
+++ b/src/Pole.Core/Consts.cs
@@ -12,4 +12,3 @@ namespace Pole.Core
         public const string ConsumerExceptionDetailsStr = "pole-consumer-exception-details";
     }
 }
-}
diff --git a/src/Pole.EventBus.Rabbitmq/Consumer/ConsumerManager.cs b/src/Pole.EventBus.Rabbitmq/Consumer/ConsumerManager.cs
index 94c728c..ecea2bf 100644
--- a/src/Pole.EventBus.Rabbitmq/Consumer/ConsumerManager.cs
+++ b/src/Pole.EventBus.Rabbitmq/Consumer/ConsumerManager.cs
@@ -40,7 +40,6 @@ namespace Pole.EventBus.RabbitMQ
         private Timer DistributedMonitorTime { get; set; }
         private Timer DistributedHoldTimer { get; set; }
         const int lockHoldingSeconds = 60;
-        int distributedMonitorTimeLock = 0;
         int distributedHoldTimerLock = 0;
         int heathCheckTimerLock = 0;
         private async Task Start()
diff --git a/src/Pole.EventBus.Rabbitmq/Consumer/ConsumerRunner.cs b/src/Pole.EventBus.Rabbitmq/Consumer/ConsumerRunner.cs
index 0b012e3..e68844d 100644
--- a/src/Pole.EventBus.Rabbitmq/Consumer/ConsumerRunner.cs
+++ b/src/Pole.EventBus.Rabbitmq/Consumer/ConsumerRunner.cs
@@ -138,10 +138,10 @@ namespace Pole.EventBus.RabbitMQ
                         Model.Model.ExchangeDeclare(errorExchangeName, "direct", true);
                         Model.Model.QueueDeclare(errorQueueName, true, false, false, null);
                         Model.Model.QueueBind(errorQueueName, errorExchangeName, string.Empty);
-                    }
-                    if (!Consumer.Config.AutoAck)
-                    {
-                        Model.Model.BasicAck(ea.DeliveryTag, false);
+                        if (!Consumer.Config.AutoAck)
+                        {
+                            Model.Model.BasicAck(ea.DeliveryTag, false);
+                        }
                     }
                 }
             }
--
libgit2 0.25.0