From d1a1897fff4b5a3b4374402c6de3d0e345ccff52 Mon Sep 17 00:00:00 2001
From: Paulo Morgado <470455+paulomorgado@users.noreply.github.com>
Date: Mon, 19 Feb 2018 11:55:09 +0000
Subject: [PATCH] added configuration for start and stop timeout

---
 .../Configuration_Specs.cs                    | 46 ++++++++++++++++++
 .../ConfigurationExtensions.cs                |  8 ++++
 .../Options/StartTimeoutOption.cs             | 47 +++++++++++++++++++
 .../Options/StopTimeoutOption.cs              | 47 +++++++++++++++++++
 4 files changed, 148 insertions(+)
 create mode 100644 src/Topshelf.Extensions.Configuration/Options/StartTimeoutOption.cs
 create mode 100644 src/Topshelf.Extensions.Configuration/Options/StopTimeoutOption.cs

diff --git a/src/Topshelf.Extensions.Configuration.Tests/Configuration_Specs.cs b/src/Topshelf.Extensions.Configuration.Tests/Configuration_Specs.cs
index 1ba7944f..c0903118 100644
--- a/src/Topshelf.Extensions.Configuration.Tests/Configuration_Specs.cs
+++ b/src/Topshelf.Extensions.Configuration.Tests/Configuration_Specs.cs
@@ -410,6 +410,52 @@ public void Should_create_a_service_that_runs_as_network_service()
             Assert.AreEqual("", installHost.InstallSettings.Credentials.Password);
         }
 
+        [Test]
+        public void Should_create_a_service_that_has_start_timeout()
+        {
+            var configuration = new ConfigurationBuilder()
+                .AddInMemoryCollection(new Dictionary<string, string>
+                    {
+                        { "topshelf:StartTimeout", "123" },
+                    })
+                .Build()
+                .GetSection("topshelf");
+
+            Host host = HostFactory.New(x =>
+                {
+                    x.Service<MyService>();
+                    x.ApplyConfiguration(configuration);
+                    x.ApplyCommandLine("install");
+                });
+
+            Assert.IsInstanceOf<InstallHost>(host);
+            var installHost = (InstallHost)host;
+            Assert.AreEqual(TimeSpan.FromSeconds(123), installHost.InstallSettings.StartTimeOut);
+        }
+
+        [Test]
+        public void Should_create_a_service_that_has_stopt_timeout()
+        {
+            var configuration = new ConfigurationBuilder()
+                .AddInMemoryCollection(new Dictionary<string, string>
+                    {
+                        { "topshelf:StopTimeout", "123" },
+                    })
+                .Build()
+                .GetSection("topshelf");
+
+            Host host = HostFactory.New(x =>
+                {
+                    x.Service<MyService>();
+                    x.ApplyConfiguration(configuration);
+                    x.ApplyCommandLine("install");
+                });
+
+            Assert.IsInstanceOf<InstallHost>(host);
+            var installHost = (InstallHost)host;
+            Assert.AreEqual(TimeSpan.FromSeconds(123), installHost.InstallSettings.StopTimeOut);
+        }
+
         [Test]
         public void Should_create_a_service_with_recovery_options()
         {
diff --git a/src/Topshelf.Extensions.Configuration/ConfigurationExtensions.cs b/src/Topshelf.Extensions.Configuration/ConfigurationExtensions.cs
index ed7d0fb5..bb1aef05 100644
--- a/src/Topshelf.Extensions.Configuration/ConfigurationExtensions.cs
+++ b/src/Topshelf.Extensions.Configuration/ConfigurationExtensions.cs
@@ -87,6 +87,14 @@ public static IEnumerable<Option> Parse(this IConfigurationSection configuration
                 {
                     options.Add(new InstanceOption(entry.Value));
                 }
+                else if (string.Equals(entry.Key, "StartTimeout", StringComparison.OrdinalIgnoreCase))
+                {
+                    options.Add(new StartTimeoutOption(configuration.GetSection("StartTimeout").Get<int>()));
+                }
+                else if (string.Equals(entry.Key, "StopTimeout", StringComparison.OrdinalIgnoreCase))
+                {
+                    options.Add(new StopTimeoutOption(configuration.GetSection("StopTimeout").Get<int>()));
+                }
 #if !NETCORE
                 else if (string.Equals(entry.Key, "StartMode", StringComparison.OrdinalIgnoreCase))
                 {
diff --git a/src/Topshelf.Extensions.Configuration/Options/StartTimeoutOption.cs b/src/Topshelf.Extensions.Configuration/Options/StartTimeoutOption.cs
new file mode 100644
index 00000000..02c2284a
--- /dev/null
+++ b/src/Topshelf.Extensions.Configuration/Options/StartTimeoutOption.cs
@@ -0,0 +1,47 @@
+// Copyright 2007-2014 Chris Patterson, Dru Sellers, Travis Smith, et. al.
+//  
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
+// this file except in compliance with the License. You may obtain a copy of the 
+// License at 
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0 
+// 
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+namespace Topshelf.Options
+{
+    using Topshelf.HostConfigurators;
+
+    /// <summary>
+    /// Represents an option to set a service start timeout (in seconds).
+    /// </summary>
+    /// <seealso cref="Option" />
+    internal class StartTimeoutOption
+        : Option
+    {
+        /// <summary>
+        /// The start timeout (in seconds).
+        /// </summary>
+        private readonly int startTimeout;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartTimeoutOption"/> class.
+        /// </summary>
+        /// <param name="startTimeout">The start timeout (in seconds).</param>
+        public StartTimeoutOption(int startTimeout)
+        {
+            this.startTimeout = startTimeout;
+        }
+
+        /// <summary>
+        /// Applies the option to the specified host configurator.
+        /// </summary>
+        /// <param name="configurator">The host configurator.</param>
+        public void ApplyTo(HostConfigurator configurator)
+        {
+            configurator.SetStartTimeout(System.TimeSpan.FromSeconds(this.startTimeout));
+        }
+    }
+}
diff --git a/src/Topshelf.Extensions.Configuration/Options/StopTimeoutOption.cs b/src/Topshelf.Extensions.Configuration/Options/StopTimeoutOption.cs
new file mode 100644
index 00000000..6c7ea916
--- /dev/null
+++ b/src/Topshelf.Extensions.Configuration/Options/StopTimeoutOption.cs
@@ -0,0 +1,47 @@
+// Copyright 2007-2014 Chris Patterson, Dru Sellers, Travis Smith, et. al.
+//  
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use 
+// this file except in compliance with the License. You may obtain a copy of the 
+// License at 
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0 
+// 
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+namespace Topshelf.Options
+{
+    using Topshelf.HostConfigurators;
+
+    /// <summary>
+    /// Represents an option to set a service stop timeout (in seconds).
+    /// </summary>
+    /// <seealso cref="Option" />
+    internal class StopTimeoutOption
+        : Option
+    {
+        /// <summary>
+        /// The stop timeout (in seconds).
+        /// </summary>
+        private readonly int stopTimeoout;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StopTimeoutOption"/> class.
+        /// </summary>
+        /// <param name="stopTimeoout">The stop timeout (in seconds).</param>
+        public StopTimeoutOption(int stopTimeoout)
+        {
+            this.stopTimeoout = stopTimeoout;
+        }
+
+        /// <summary>
+        /// Applies the option to the specified host configurator.
+        /// </summary>
+        /// <param name="configurator">The host configurator.</param>
+        public void ApplyTo(HostConfigurator configurator)
+        {
+            configurator.SetStopTimeout(System.TimeSpan.FromSeconds(this.stopTimeoout));
+        }
+    }
+}