Merge pull request #2602 from Particular/msmq-machine-name

Remove machine name when using logical queues
Particular · Aug 2, 2021 · 1cc2e83 · 1cc2e83
2 parents c7a496b + d88e80d
commit 1cc2e83
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/ServiceControl.Audit/Infrastructure/NServiceBusFactory.cs b/src/ServiceControl.Audit/Infrastructure/NServiceBusFactory.cs
@@ -33,9 +33,15 @@ public static void Configure(Settings.Settings settings, TransportCustomization
             //DisablePublishing API is available only on TransportExtensions for transports that implement IMessageDrivenPubSub so we need to set settings directly
             configuration.GetSettings().Set("NServiceBus.PublishSubscribe.EnablePublishing", false);
 
+            var serviceControlLogicalQueue = settings.ServiceControlQueueAddress;
+            if (serviceControlLogicalQueue.IndexOf("@") >= 0)
+            {
+                serviceControlLogicalQueue = serviceControlLogicalQueue.Substring(0, serviceControlLogicalQueue.IndexOf("@"));
+            }
+
             var routing = new RoutingSettings(configuration.GetSettings());
-            routing.RouteToEndpoint(typeof(RegisterNewEndpoint), settings.ServiceControlQueueAddress);
-            routing.RouteToEndpoint(typeof(MarkMessageFailureResolvedByRetry), settings.ServiceControlQueueAddress);
+            routing.RouteToEndpoint(typeof(RegisterNewEndpoint), serviceControlLogicalQueue);
+            routing.RouteToEndpoint(typeof(MarkMessageFailureResolvedByRetry), serviceControlLogicalQueue);
 
             configuration.GetSettings().Set(loggingSettings);
             configuration.SetDiagnosticsPath(loggingSettings.LogPath);