Merge pull request #292 from Particular/hotfix-4.3.1

Hotfix 4.3.1
Particular · Apr 17, 2019 · 6cfd701 · 6cfd701
2 parents 16edd07 + 35319ff
commit 6cfd701
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/NServiceBus.AmazonSQS/MessagePump.cs b/src/NServiceBus.AmazonSQS/MessagePump.cs
@@ -25,6 +25,8 @@ public MessagePump(TransportConfiguration configuration, IAmazonS3 s3Client, IAm
 
         public async Task Init(Func<MessageContext, Task> onMessage, Func<ErrorContext, Task<ErrorHandleResult>> onError, CriticalError criticalError, PushSettings settings)
         {
+            this.criticalError = criticalError;
+
             queueUrl = await queueUrlCache.GetQueueUrl(QueueNameHelper.GetSqsQueueName(settings.InputQueue, configuration))
                 .ConfigureAwait(false);
             errorQueueUrl = await queueUrlCache.GetQueueUrl(QueueNameHelper.GetSqsQueueName(settings.ErrorQueue, configuration))
@@ -396,8 +398,9 @@ async Task ProcessMessageWithInMemoryRetries(Dictionary<string, string> headers,
                     }
                     catch (Exception onErrorEx)
                     {
-                        Logger.Error("Exception thrown from error handler", onErrorEx);
+                        criticalError.Raise($"Failed to execute recoverability policy for message with native ID: `{nativeMessageId}`", onErrorEx);
                     }
+
                     errorHandled = errorHandlerResult == ErrorHandleResult.Handled;
                 }
             }
@@ -546,8 +549,9 @@ await Task.Delay(TimeSpan.FromSeconds(i))
         QueueUrlCache queueUrlCache;
         int numberOfMessagesToFetch;
         ReceiveMessageRequest receiveMessagesRequest;
-        static readonly TransportTransaction transportTransaction = new TransportTransaction();
+        CriticalError criticalError;
 
+        static readonly TransportTransaction transportTransaction = new TransportTransaction();
         static ILog Logger = LogManager.GetLogger(typeof(MessagePump));
     }
 }
diff --git a/src/TransportTests/TransportTests.csproj b/src/TransportTests/TransportTests.csproj
@@ -13,8 +13,9 @@
     <PackageReference Include="AWSSDK.S3" Version="3.3.18.5" />
     <PackageReference Include="AWSSDK.SQS" Version="3.3.3.10" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="7.1.0" />
+    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="7.2.0-beta0079" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
   </ItemGroup>
+
 </Project>