Added timeout to ensure we do not block forever

John Simons · John Simons · commit c5e39246d781 · 2014-12-05T11:54:52.000+10:00
diff --git a/src/NServiceBus.RabbitMQ/RabbitMqDequeueStrategy.cs b/src/NServiceBus.RabbitMQ/RabbitMqDequeueStrategy.cs
@@ -146,10 +146,13 @@ void StartConsumer(string queue)
 
         void ConsumeMessages(object state)
         {
-            try
+            if (!tracksRunningThreads.Wait(TimeSpan.FromSeconds(1)))
             {
-                tracksRunningThreads.Wait();
+                return;
+            }
 
+            try
+            {
                 var parameters = (ConsumeParams)state;
                 var connection = connectionManager.GetConsumeConnection();
 

Original file line number	Diff line number	Diff line change
`@@ -146,10 +146,13 @@ void StartConsumer(string queue)`
`146`	`146`
`147`	`147`	`void ConsumeMessages(object state)`
`148`	`148`	`{`
`149`		`- try`
	`149`	`+ if (!tracksRunningThreads.Wait(TimeSpan.FromSeconds(1)))`
`150`	`150`	`{`
`151`		`- tracksRunningThreads.Wait();`
	`151`	`+ return;`
	`152`	`+ }`
`152`	`153`
	`154`	`+ try`
	`155`	`+ {`
`153`	`156`	`var parameters = (ConsumeParams)state;`
`154`	`157`	`var connection = connectionManager.GetConsumeConnection();`
`155`	`158`