Merge branch 'hotfix/#22-bug'

SiteWarmer/SiteWarmer.Core.Test/RepeatWarmerTest.cs

@@ -54,6 +54,38 @@ public void Warm_WhenInitialCallFails_ThenRetryOnlyTheNumberOfTimesWeAreConfigur
 			Assert.AreNotEqual(Check.Ok, results[0].Status);
 		}
 
+		[Test]
+		public void Warm_WhenCallPasses_ThenDoNotRetryUrl()
+		{
+			var config = new Mock<IConfig>();
+			config.Setup(m => m.Checks).Returns(new List<Check>
+				{
+					new Check
+						{
+							Url = "http://www.google.com"
+						},
+					new Check
+						{
+							Url = "http://www.google.co.uk"
+						}
+				});
+
+			var requester = new Mock<IRequester>();
+			requester.Setup(m => m.Check(It.IsAny<Check>()))
+			         .Callback((Check c) =>
+				         {
+					         c.Status = c.Url.Equals("http://www.google.com") ? 500 : Check.Ok;
+				         });
+
+			var logger = BaseLogger();
+
+			var warmer = new RepeatWarmer(config.Object, requester.Object, logger.Object, 2);
+
+			warmer.Warm();
+
+			requester.Verify(f => f.Check(It.IsAny<Check>()), Times.Exactly(3));
+		}
+
 		private static Mock<IConfig> BaseConfig()
 		{
 			var config = new Mock<IConfig>();

SiteWarmer/SiteWarmer.Core/CustomWarmer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using SiteWarmer.Core.Comms;
 using SiteWarmer.Core.Config;
@@ -30,11 +31,21 @@ public CustomWarmer(IConfig config, IRequester requester)
 		/// <param name="action">Custom action to execute after each Check is requested</param>
 		public void Warm(Action<Check> action)
 		{
-			Parallel.ForEach(_config.Checks, check =>
-				{
-					_requester.Check(check);
-					action.Invoke(check);
-				});
+			Warm(_config.Checks, action);
+		}
+
+		/// <summary>
+		/// Warm all URLs in the Check collection passed in
+		/// </summary>
+		/// <param name="checks">Check collection to warm</param>
+		/// <param name="action">Custom action to execute after each Check is requested</param>
+		public void Warm(IList<Check> checks, Action<Check> action)
+		{
+			Parallel.ForEach(checks, check =>
+			{
+				_requester.Check(check);
+				action.Invoke(check);
+			});
 		}
 	}
 }

SiteWarmer/SiteWarmer.Core/Warmer.cs

@@ -49,7 +49,7 @@ public IList<Check> Warm()
 		/// <returns>Whether all checks have completed</returns>
 		protected virtual bool RunChecks(IList<Check> checks)
 		{
-			_warmer.Warm(_logger.Log);
+			_warmer.Warm(checks, _logger.Log);
 
 			return true;
 		}