Merge pull request #4 from stevewgh/develop

Merge Develop into Master

Author: stevewgh

src/Topshelf.Leader.Tests/MultipleNodeTests.cs

@@ -20,8 +20,11 @@ public async Task only_one_node_should_be_running_at_any_one_time()
             BuildSubject(node2, manager, out var service2, out var node2Runner);
 
             //  start the runners async
+#pragma warning disable 4014
             node1Runner.Start();
             node2Runner.Start();
+#pragma warning restore 4014
+
             await Task.Delay(500);
 
             Assert.True(service1.Started);
@@ -45,8 +48,11 @@ public async Task should_be_notified_when_the_leadership_changes()
             BuildSubject(node2, manager, b => { if (!node2Elected) node2Elected = b; }, out var _, out var node2Runner);
 
             //  start the runners async
+#pragma warning disable 4014
             node1Runner.Start();
             node2Runner.Start();
+#pragma warning restore 4014
+
             await Task.Delay(500);
 
             manager.AssignLeader(node2);

src/Topshelf.Leader/Runner.cs

@@ -30,45 +30,49 @@ public async Task Start()
                     continue;
                 }
 
-                var noLongerTheLeader = new CancellationTokenSource();
-                var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(config.ServiceIsStopping.Token, noLongerTheLeader.Token);
-                try
+                using (var noLongerTheLeader = new CancellationTokenSource())
                 {
-                    var leaseTask = RenewLease(linkedTokenSource.Token, noLongerTheLeader);
-                    var startupTask = config.Startup(service, linkedTokenSource.Token);
-                    var whenAnyTask = await Task.WhenAny(leaseTask, startupTask);
-
-                    var exceptions = new List<Exception>();
-                    if (startupTask.IsFaulted)
+                    using (var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(config.ServiceIsStopping.Token, noLongerTheLeader.Token))
                     {
-                        config.ServiceIsStopping.Cancel();
-                        if (startupTask.Exception != null)
+                        try
                         {
-                            exceptions.Add(startupTask.Exception.GetBaseException());
-                        }
-                    }
+                            var leaseTask = RenewLease(linkedTokenSource.Token, noLongerTheLeader);
+                            var startupTask = config.Startup(service, linkedTokenSource.Token);
+                            var whenAnyTask = await Task.WhenAny(leaseTask, startupTask);
 
-                    if (leaseTask.IsFaulted)
-                    {
-                        if (leaseTask.Exception != null)
+                            var exceptions = new List<Exception>();
+                            if (startupTask.IsFaulted)
+                            {
+                                config.ServiceIsStopping.Cancel();
+                                if (startupTask.Exception != null)
+                                {
+                                    exceptions.Add(startupTask.Exception.GetBaseException());
+                                }
+                            }
+
+                            if (leaseTask.IsFaulted)
+                            {
+                                if (leaseTask.Exception != null)
+                                {
+                                    exceptions.Add(leaseTask.Exception.GetBaseException());
+                                }
+                            }
+
+                            if (exceptions.Any())
+                            {
+                                throw new AggregateException(exceptions);
+                            }
+
+                            await whenAnyTask;
+                        }
+                        catch (TaskCanceledException)
                         {
-                            exceptions.Add(leaseTask.Exception.GetBaseException());
+                        }
+                        finally
+                        {
+                            linkedTokenSource.Cancel();
                         }
                     }
-
-                    if (exceptions.Any())
-                    {
-                        throw new AggregateException(exceptions);
-                    }
-
-                    await whenAnyTask;
-                }
-                catch (TaskCanceledException)
-                {
-                }
-                finally
-                {
-                    linkedTokenSource.Cancel();
                 }
             }
         }

src/Topshelf.Leader/Topshelf.Leader.nuspec

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>Topshelf.Leader</id>
-        <version>1.0.0.0</version>
+        <version>$version$</version>
         <title>Topshelf Leader</title>
         <authors>Steven Ward</authors>
         <owners>Steven Ward</owners>
@@ -14,10 +14,12 @@
         <copyright>Copyright 2018</copyright>
         <tags>Topshelf Leader Election</tags>
         <dependencies>
-            <dependency id="Topshelf" version="4.0.0" />
+            <group>
+                <dependency id="Topshelf" version="4.0.3" />
+            </group>
         </dependencies>
     </metadata>
     <files>
-        <file src="Topshelf.Leader.dll" target="lib\net452\Topshelf.Leader.dll" />
+        <file src="bin\$configuration$\Topshelf.Leader.dll" target="lib\net452\Topshelf.Leader.dll" />
     </files>
 </package>