Merge pull request #7288 from Particular/hostname-override-fix-8.2

Overriding the host name does not work consistently

Author: jasontaylordev

src/NServiceBus.Core.Tests/Hosting/HostInfoSettingsTests.cs

@@ -37,8 +37,11 @@ public void It_overrides_the_machine_name()
 
             busConfig.UniquelyIdentifyRunningInstance().UsingHostName("overridenhostname");
 
-            var hostName = RuntimeEnvironment.MachineName;
-            Assert.AreEqual("overridenhostname", hostName);
+            var runtimeMachineName = RuntimeEnvironment.MachineName;
+            Assert.AreEqual("overridenhostname", runtimeMachineName);
+
+            var settingsMachineName = busConfig.Settings.Get<HostingComponent.Settings>().Properties["Machine"];
+            Assert.AreEqual("overridenhostname", settingsMachineName);
         }
     }
 }

src/NServiceBus.Core/Hosting/HostInfoSettings.cs

@@ -2,7 +2,6 @@ namespace NServiceBus
 {
     using System;
     using Hosting;
-    using NServiceBus.Support;
 
     /// <summary>
     /// Configuration class for <see cref="HostInformation" /> settings.
@@ -74,7 +73,7 @@ public HostInfoSettings UsingCustomDisplayName(string displayName)
         public HostInfoSettings UsingHostName(string hostName)
         {
             Guard.ThrowIfNullOrEmpty(hostName);
-            RuntimeEnvironment.SetMachineName(hostName);
+            config.Settings.Get<HostingComponent.Settings>().UpdateHost(hostName);
             return this;
         }
 

src/NServiceBus.Core/Hosting/HostingComponent.Settings.cs

@@ -103,6 +103,14 @@ internal void ApplyHostIdDefaultIfNeeded()
                 settings.Set(HostIdSettingsKey, DeterministicGuid.Create(fullPathToStartingExe, RuntimeEnvironment.MachineName));
             }
 
+            internal void UpdateHost(string hostName)
+            {
+                RuntimeEnvironment.SetMachineName(hostName);
+                settings.Set(HostIdSettingsKey, DeterministicGuid.Create(fullPathToStartingExe, hostName));
+                Properties["Machine"] = hostName;
+                settings.SetDefault(DisplayNameSettingsKey, hostName);
+            }
+
             readonly SettingsHolder settings;
             readonly string fullPathToStartingExe;