Separate queue and log folders per Windows Service Instance

See issues #357 and #355

Author: gbiellem

src/ServiceControl/Bootstrapper.cs

@@ -22,10 +22,10 @@ public class Bootstrapper
 
         public Bootstrapper(ServiceBase host = null)
         {
+            Settings.ServiceName = "foo";  // DetermineServiceName(host);
             ConfigureLogging();
-
             var containerBuilder = new ContainerBuilder();
-
+            
             Container = containerBuilder.Build();
 
             // Disable Auditing for the service control endpoint
@@ -39,11 +39,10 @@ public Bootstrapper(ServiceBase host = null)
 
             Feature.EnableByDefault<StorageDrivenPublisher>();
             Configure.ScaleOut(s => s.UseSingleBrokerQueue());
-
             var transportType = Type.GetType(Settings.TransportType);
             bus = Configure
                 .With(AllAssemblies.Except("ServiceControl.Plugin"))
-                .DefineEndpointName("Particular.ServiceControl")
+                .DefineEndpointName(Settings.ServiceName)
                 .AutofacBuilder(Container)
                 .UseTransport(transportType)
                 .MessageForwardingInCaseOfFault()
@@ -83,7 +82,7 @@ static void ConfigureLogging()
 
             var nlogConfig = new LoggingConfiguration();
             var simpleLayout = new SimpleLayout("${longdate}|${threadid}|${level}|${logger}|${message}${onexception:${newline}${exception:format=tostring}}");
-            
+
             var fileTarget = new FileTarget
             {
                 ArchiveEvery = FileArchivePeriod.Day,
@@ -112,5 +111,14 @@ static void ConfigureLogging()
             NLogConfigurator.Configure(new object[] { fileTarget, consoleTarget }, "Info");
             LogManager.Configuration = nlogConfig;
         }
+   
+        string DetermineServiceName(ServiceBase host)
+        {
+            if ((host == null) || (string.IsNullOrWhiteSpace(host.ServiceName)))
+            {
+                return "Particular.ServiceControl";
+            }
+            return host.ServiceName;
+        }
     }
 }

src/ServiceControl/ConfigErrorQueue.cs

@@ -9,7 +9,7 @@ public MessageForwardingInCaseOfFaultConfig GetConfiguration()
         {
             return new MessageForwardingInCaseOfFaultConfig
             {
-                ErrorQueue = "Particular.ServiceControl.Errors"
+                ErrorQueue = string.Format("{0}.Errors", NServiceBus.Configure.EndpointName)
             };
         }
     }

src/ServiceControl/Infrastructure/Settings/Settings.cs

@@ -134,10 +134,13 @@ static string SanitiseFolderName(string folderName)
         public static TimeSpan HeartbeatGracePeriod = TimeSpan.Parse(SettingsReader<string>.Read("HeartbeatGracePeriod", "00:00:40"));
         public static string TransportType { get; set; }
 
-        public static readonly string LogPath =
-            Environment.ExpandEnvironmentVariables(SettingsReader<string>.Read("LogPath",
-                Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                    "Particular\\ServiceControl\\logs")));
+        public static string LogPath
+        {
+            get
+            {
+                return Environment.ExpandEnvironmentVariables(SettingsReader<string>.Read("LogPath", DefaultLogPathForInstance())); 
+            }
+        }
 
         public static string DbPath;
         public static Address ErrorLogQueue;
@@ -151,5 +154,17 @@ static string SanitiseFolderName(string folderName)
         public static int HoursToKeepMessagesBeforeExpiring = SettingsReader<int>.Read("HoursToKeepMessagesBeforeExpiring", 24 * 30); // default is 30 days
 
         static readonly ILog Logger = LogManager.GetLogger(typeof(Settings));
+        public static string ServiceName;
+
+        static string DefaultLogPathForInstance()
+        {
+            if (ServiceName.Equals("Particular.ServiceControl", StringComparison.OrdinalIgnoreCase))
+            {
+                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));
+
+        }
     }
 }