Skip to content

Only display instructions for MSMQ #5104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnsimons merged 1 commit into from
Aug 26, 2025
Merged

Only display instructions for MSMQ #5104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/Particular.LicensingComponent/Shared/ServiceControlSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ public static class ServiceControlSettings
public static string ServiceControlThroughputDataQueueSetting = "ServiceControlThroughputDataQueue";
public static string ServiceControlThroughputDataQueue = SettingsReader.Read(ThroughputSettings.SettingsNamespace, ServiceControlThroughputDataQueueSetting, "ServiceControl.ThroughputData");

static string SCQueue = $"{ThroughputSettings.SettingsNamespace.Root}/{ServiceControlThroughputDataQueueSetting}";
static string SCQueueDescription = $"Service Control throughput processing queue. This setting must match the equivalent `Monitoring/{ServiceControlThroughputDataQueueSetting}` setting for the Monitoring instance.";

static string MonitoringQueue = $"Monitoring/{ServiceControlThroughputDataQueueSetting}";
static string MonitoringQueueDescription = $"Queue to send monitoring throughput data to for processing by ServiceControl. This setting must match the equivalent `{ThroughputSettings.SettingsNamespace.Root}/{ServiceControlThroughputDataQueueSetting}` setting for the ServiceControl instance.";
static string MonitoringQueueDescription = $"Queue to send monitoring throughput data to for processing by ServiceControl. This setting only needs to be specified if the Monitoring instance is not hosted in the same machine as the Error instance is running on.";

public static List<ThroughputConnectionSetting> GetServiceControlConnectionSettings()
{
return [new ThroughputConnectionSetting(SCQueue, SCQueueDescription)];
return [];
}

public static List<ThroughputConnectionSetting> GetMonitoringConnectionSettings()
Expand Down
2 changes: 1 addition & 1 deletion src/Particular.LicensingComponent/ThroughputCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public async Task<ThroughputConnectionSettings> GetThroughputConnectionSettingsI
var throughputConnectionSettings = new ThroughputConnectionSettings
{
ServiceControlSettings = ServiceControlSettings.GetServiceControlConnectionSettings(),
MonitoringSettings = ServiceControlSettings.GetMonitoringConnectionSettings(),
MonitoringSettings = throughputSettings.TransportType == "MSMQ" ? ServiceControlSettings.GetMonitoringConnectionSettings() : [],
BrokerSettings = throughputQuery?.Settings.Select(pair => new ThroughputConnectionSetting($"{ThroughputSettings.SettingsNamespace.Root}/{pair.Key}", pair.Description)).ToList() ?? []
};
return await Task.FromResult(throughputConnectionSettings);
Expand Down
Loading