Fixed #375

Author: gbiellem

src/ServiceControl/Hosting/Commands/RunCommand.cs

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

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));
 
         }
     }