Wrap ServerBootstrapper with automatic retry

Fixes #291
HangfireIO · Jan 27, 2015 · 193c698 · 193c698
1 parent 8a6604f
commit 193c698
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/Hangfire.Core/BackgroundJobServer.cs b/src/Hangfire.Core/BackgroundJobServer.cs
@@ -119,7 +119,7 @@ internal virtual IServerSupervisor GetBootstrapSupervisor()
                 _storage, 
                 new Lazy<IServerSupervisor>(GetSupervisors));
 
-            return new ServerSupervisor(
+            return CreateSupervisor(
                 bootstrapper, 
                 new ServerSupervisorOptions
                 {
@@ -162,7 +162,12 @@ private IEnumerable<IServerComponent> GetCommonComponents()
 
         private static ServerSupervisor CreateSupervisor(IServerComponent component)
         {
-            return new ServerSupervisor(new AutomaticRetryServerComponentWrapper(component));
+            return CreateSupervisor(component, new ServerSupervisorOptions());
+        }
+
+        private static ServerSupervisor CreateSupervisor(IServerComponent component, ServerSupervisorOptions options)
+        {
+            return new ServerSupervisor(new AutomaticRetryServerComponentWrapper(component), options);
         }
     }
 }
diff --git a/src/Hangfire.Core/Server/ServerBootstrapper.cs b/src/Hangfire.Core/Server/ServerBootstrapper.cs
@@ -102,7 +102,7 @@ public void Execute(CancellationToken cancellationToken)
 
         public override string ToString()
         {
-            return "Server Core";
+            return "Server Bootstrapper";
         }
 
         public void Dispose()

diff --git a/tests/Hangfire.Core.Tests/BackgroundJobServerFacts.cs b/tests/Hangfire.Core.Tests/BackgroundJobServerFacts.cs
@@ -92,14 +92,21 @@ public void Dispose_DisposesBootstrapSupervisor()
         }
 
         [Fact]
-        public void GetBootstrapSupervisor_ReturnsNonNullResult()
+        public void GetBootstrapSupervisor_ReturnsBootstrapper_WrappedWithAutomaticRetry()
         {
+            // Arrange
             var server = CreateServer();
 
+            // Act
             var supervisor = server.GetBootstrapSupervisor();
 
+            // Assert
             Assert.NotNull(supervisor);
-            Assert.IsType<ServerBootstrapper>(((ServerSupervisor) supervisor).Component);
+
+            var wrapper = ((ServerSupervisor) supervisor).Component;
+
+            Assert.IsType<AutomaticRetryServerComponentWrapper>(wrapper);
+            Assert.IsType<ServerBootstrapper>(((AutomaticRetryServerComponentWrapper)wrapper).InnerComponent);
         }
 
         [Fact]