Merge branch 'develop'

Author: gbiellem

src/ServiceControl/Bootstrapper.cs

@@ -5,6 +5,7 @@ namespace Particular.ServiceControl
     using System.IO;
     using System.ServiceProcess;
     using Autofac;
+    using Hosting;
     using NLog;
     using NLog.Config;
     using NLog.Layouts;
@@ -20,14 +21,14 @@ public class Bootstrapper
         IStartableBus bus;
         public static IContainer Container { get; set; }
 
-        public Bootstrapper(ServiceBase host = null)
+        public Bootstrapper(ServiceBase host = null, HostArguments hostArguments = null)
         {
-            Settings.ServiceName = DetermineServiceName(host);
+            Settings.ServiceName = DetermineServiceName(host, hostArguments);
             ConfigureLogging();
             var containerBuilder = new ContainerBuilder();
-            
+
             Container = containerBuilder.Build();
-            
+
             // Disable Auditing for the service control endpoint
             Configure.Features.Disable<Audit>();
             Configure.Features.Enable<Sagas>();
@@ -112,8 +113,15 @@ static void ConfigureLogging()
             LogManager.Configuration = nlogConfig;
         }
 
-        string DetermineServiceName(ServiceBase host)
+        string DetermineServiceName(ServiceBase host, HostArguments hostArguments)
         {
+            //if Arguments not null then bootstrapper was run from installer so use servicename passed to the installer
+            if (hostArguments != null)
+            {
+                return hostArguments.ServiceName;
+            }
+
+            // Try to get HostName from Windows Service Name, default to "Particular.ServiceControl"
             if ((host == null) || (string.IsNullOrWhiteSpace(host.ServiceName)))
             {
                 return "Particular.ServiceControl";

src/ServiceControl/Hosting/Commands/RunBootstrapperAndNServiceBusInstallers.cs

@@ -9,7 +9,7 @@ public override void Execute(HostArguments args)
         {
             WindowsInstallerRunner.RunInstallers = true;
             WindowsInstallerRunner.RunAs = args.Username;
-            new Bootstrapper();
+            new Bootstrapper(null, args);
         }
     }
 }

src/ServiceControl/Hosting/Commands/RunCommand.cs

@@ -10,16 +10,18 @@ public override void Execute(HostArguments args)
         {
             if (!Environment.UserInteractive)
             {
-                using (var service = new Host())
+                using (var service = new Host{ServiceName = args.ServiceName})
                 {
                     service.Run();
                 }
 
                 return;
             }
 
-            using (var service = new Host())
+            using (var service = new Host{ ServiceName = args.ServiceName} )
             {
+
+
                 using (var waitHandle = new ManualResetEvent(false))
                 {
                     service.OnStopping = () =>

src/ServiceControl/Hosting/Commands/ServiceCommand.cs

@@ -38,7 +38,7 @@ public void ExecuteInternal(HostArguments args)
                 serviceProcessInstaller
             };
 
-            var arguments = String.Empty;
+            var arguments = string.Format(" --serviceName:{0}", args.ServiceName);
 
             using (var hostInstaller = new HostInstaller(args, arguments, installers))
             using (var transactedInstaller = new TransactedInstaller())

src/ServiceControl/Hosting/Help.txt

@@ -78,6 +78,7 @@ EXAMPLES:
      --description="Service for monitoring" 
      --username="corp\serviceuser"
      --password="p@ssw0rd!"
-     --url="http://localhost:9090"
+     --d=ServiceControl/Hostname==localhost 
+     --d=ServiceControl/Port==33334
 
    ServiceControl.exe --uninstall --serviceName="MyServiceControl"

src/ServiceControl/Hosting/HostArguments.cs

@@ -9,7 +9,7 @@ namespace Particular.ServiceControl.Hosting
     using Commands;
     using global::ServiceControl.Hosting.Commands;
 
-    internal class HostArguments
+    public class HostArguments
     {
         public HostArguments(string[] args)
         {
@@ -103,6 +103,8 @@ public HostArguments(string[] args)
                 }
             };
 
+            
+
             installOptions = new OptionSet
             {
                 {
@@ -288,7 +290,7 @@ internal enum ExecutionMode
         Run
     }
 
-    internal enum StartMode
+    public enum StartMode
     {
         Manual,
         Automatic,

src/ServiceControl/Hosting/HostInstaller.cs

@@ -19,15 +19,10 @@ public override void Install(IDictionary stateSaver)
 
             base.Install(stateSaver);
 
-            using (
-                var service =
-                    Registry.LocalMachine.OpenSubKey(
-                        string.Format(@"System\CurrentControlSet\Services\{0}", settings.ServiceName), true))
+            using (var service = Registry.LocalMachine.OpenSubKey(string.Format(@"System\CurrentControlSet\Services\{0}", settings.ServiceName), true))
             {
                 var imagePath = (string) service.GetValue("ImagePath");
-
                 imagePath += arguments;
-
                 service.SetValue("ImagePath", imagePath);
             }
         }

src/ServiceControl/Infrastructure/Nancy/Modules/RootModule.cs

@@ -50,6 +50,7 @@ public RootModule()
             Get["/instance-info"] = p => Negotiate
                     .WithModel(new
                                   {
+                                      WindowsService = Settings.ServiceName,
                                       LogfilePath = Path.Combine(Settings.LogPath, "logfile.txt"),
                                       Settings.TransportType,
                                   })

src/ServiceControl/Infrastructure/Settings/Settings.cs

@@ -162,8 +162,7 @@ static string DefaultLogPathForInstance()
             {
                 return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Particular\\ServiceControl\\logs");
             }
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                string.Format("Particular\\ServiceControl-{0}\\logs", ServiceName));
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), string.Format("Particular\\{0}\\logs", ServiceName));
 
         }
     }