Merge pull request #35 from graemefoster/expose-task-instead-of-always-blocking

Expose task instead of always blocking

Author: robdmoore

AzureWebFarm.OctopusDeploy/WebFarmRole.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel.Design;
 using System.Net.Configuration;
 using System.Threading;
+using System.Threading.Tasks;
 using AzureWebFarm.OctopusDeploy.Infrastructure;
 using Microsoft.WindowsAzure.ServiceRuntime;
 using Serilog;
@@ -58,26 +59,37 @@ public bool OnStart()
         /// Call from the RoleEntryPoint.Run() method.
         /// Note: This method is an infinite loop; call from a Thread/Task if you want to run other code alongside.
         /// </summary>
-        public void Run()
+        public async Task Run(CancellationToken token)
         {
             // Don't want to configure IIS if we are emulating; just sleep forever
-            if (RoleEnvironment.IsEmulated)
-                Thread.Sleep(-1);
-
-            while (true)
+            try
             {
-                try
+                if (RoleEnvironment.IsEmulated)
                 {
-                    IisEnvironment.ActivateAppInitialisationModuleForAllSites();
+                    while (!token.IsCancellationRequested)
+                    {
+                        await Task.Delay(100, token);
+                    }
                 }
-                catch (Exception e)
+
+                while (!token.IsCancellationRequested)
                 {
-                    Log.Warning(e, "Failure to configure IIS");
-                }
+                    try
+                    {
+                        IisEnvironment.ActivateAppInitialisationModuleForAllSites();
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Warning(e, "Failure to configure IIS");
+                    }
 
-                Thread.Sleep(TimeSpan.FromMinutes(10));
+                    await Task.Delay(TimeSpan.FromMinutes(10), token);
+                }
+            }
+            catch (TaskCanceledException)
+            {
             }
-        // ReSharper disable FunctionNeverReturns
+            // ReSharper disable FunctionNeverReturns
         }
         // ReSharper restore FunctionNeverReturns
 

ExampleWebFarm/WebRole.cs

@@ -1,3 +1,4 @@
+using System.Threading;
 using Microsoft.WindowsAzure.ServiceRuntime;
 
 namespace WebFarm
@@ -18,7 +19,7 @@ public override bool OnStart()
 
         public override void Run()
         {
-            _webFarmRole.Run();
+            _webFarmRole.Run(new CancellationTokenSource().Token).Wait();
         }
 
         public override void OnStop()