Merge branch 'hotfix-2.1.1'

Author: andreasohlund

src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj

@@ -210,6 +210,7 @@
     <Compile Include="App_Packages\NSB.AcceptanceTests.5.1.3\Versioning\When_multiple_versions_of_a_message_is_published.cs" />
     <Compile Include="App_Packages\NSB.AcceptanceTests.5.1.3\Volatile\When_sending_to_non_durable_endpoint.cs" />
     <Compile Include="When_using_direct_routing.cs" />
+    <Compile Include="When_the_broker_connection_is_lost.cs" />
     <Compile Include="When_using_a_custom_message_id_strategy.cs" />
     <Compile Include="When_callback_receiver_is_disabled.cs" />
     <Compile Include="When_scaling_out_senders_that_uses_callbacks.cs" />

src/NServiceBus.RabbitMQ.AcceptanceTests/When_the_broker_connection_is_lost.cs

@@ -0,0 +1,88 @@
+namespace NServiceBus.RabbitMQ.AcceptanceTests
+{
+    using System;
+    using NServiceBus.AcceptanceTesting;
+    using NServiceBus.AcceptanceTests.EndpointTemplates;
+    using NServiceBus.Transports.RabbitMQ;
+    using NUnit.Framework;
+
+    public class When_the_broker_connection_is_lost
+    {
+        [Test]
+        public void Should_reconnect()
+        {
+            var context = new Context
+            {
+                MessageId = Guid.NewGuid().ToString()
+            };
+
+            Scenario.Define(context)
+                   .WithEndpoint<Receiver>()
+                   .Done(c => context.GotTheMessage)
+                   .AllowExceptions()
+                   .Run();
+
+            Assert.True(context.GotTheMessage, "Should receive the message");
+        }
+
+
+        public class Receiver : EndpointConfigurationBuilder
+        {
+            public Receiver()
+            {
+                EndpointSetup<DefaultServer>();
+            }
+
+            class ConnectionKiller:IWantToRunWhenBusStartsAndStops
+            {
+                readonly IManageRabbitMqConnections connectionManager;
+                readonly IBus bus;
+                readonly Context context;
+
+                public ConnectionKiller(IManageRabbitMqConnections connectionManager,IBus bus,Context context)
+                {
+                    this.connectionManager = connectionManager;
+                    this.bus = bus;
+                    this.context = context;
+                }
+
+                public void Start()
+                {
+                    connectionManager.GetConsumeConnection().Abort();
+                    bus.SendLocal(new MyRequest
+                    {
+                        MessageId = context.MessageId
+                    });
+                }
+
+                public void Stop()
+                {
+                }
+            }
+
+            class MyHandler : IHandleMessages<MyRequest>
+            {
+                public Context Context { get; set; }
+
+                public void Handle(MyRequest message)
+                {
+                    if (message.MessageId == Context.MessageId)
+                    {
+                        Context.GotTheMessage = true;             
+                    }
+                }
+            }
+        }
+
+        class MyRequest : IMessage
+        {
+            public string MessageId { get; set; }
+        }
+
+        class Context : ScenarioContext
+        {
+            public bool GotTheMessage { get; set; }
+            public string MessageId { get; set; }
+        }
+    }
+}

src/NServiceBus.RabbitMQ/Config/RabbitMqTransportFeature.cs

@@ -155,15 +155,15 @@ static RepeatedFailuresOverTimeCircuitBreaker SetupCircuitBreaker(CriticalError
         {
 
             var timeToWaitBeforeTriggering = TimeSpan.FromMinutes(2);
-            var timeToWaitBeforeTriggeringOverride = ConfigurationManager.AppSettings["NServiceBus/RabbitMqDequeueStrategy/TimeToWaitBeforeTriggering"] ?? "00:02:00";
+            var timeToWaitBeforeTriggeringOverride = ConfigurationManager.AppSettings["NServiceBus/RabbitMqDequeueStrategy/TimeToWaitBeforeTriggering"];
 
             if (!string.IsNullOrEmpty(timeToWaitBeforeTriggeringOverride))
             {
                 timeToWaitBeforeTriggering = TimeSpan.Parse(timeToWaitBeforeTriggeringOverride);
             }
 
             var delayAfterFailure = TimeSpan.FromSeconds(5);
-            var delayAfterFailureOverride = ConfigurationManager.AppSettings["NServiceBus/RabbitMqDequeueStrategy/DelayAfterFailure"] ?? "00:02:00";
+            var delayAfterFailureOverride = ConfigurationManager.AppSettings["NServiceBus/RabbitMqDequeueStrategy/DelayAfterFailure"];
 
             if (!string.IsNullOrEmpty(delayAfterFailureOverride))
             {
@@ -172,7 +172,7 @@ static RepeatedFailuresOverTimeCircuitBreaker SetupCircuitBreaker(CriticalError
 
             return new RepeatedFailuresOverTimeCircuitBreaker("RabbitMqConnectivity",
                 timeToWaitBeforeTriggering, 
-                ex => criticalError.Raise("Repeated failures when communicating with the RabbitMq broker",
+                ex => criticalError.Raise("Repeated failures when communicating with the broker",
                     ex), delayAfterFailure);
         }