Skip to content

Commit c1e1622

Browse files
committed
Update wording of prerequisites
1 parent ab97415 commit c1e1622

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/ServiceControl.Config/Commands/ScmuCommandChecks.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
using System;
44
using System.Diagnostics;
5+
using System.Text;
56
using System.Threading.Tasks;
67
using ServiceControl.Config.Framework;
78
using ServiceControlInstaller.Engine;
@@ -21,12 +22,19 @@ protected override async Task<bool> PromptForRabbitMqCheck(bool isUpgrade)
2122
{
2223
var title = isUpgrade ? "UPGRADE WARNING" : "INSTALL WARNING";
2324
var beforeWhat = isUpgrade ? "upgrading" : "installing";
24-
var message = $"ServiceControl version {Constants.CurrentVersion} requires:\n• RabbitMQ broker version 3.10.0 or higher\n• The stream_queue and quorum_queue feature flags must be enabled\n• The management plugin must be enabled\n\nPlease confirm your broker meets the minimum requirements before {beforeWhat}.";
2525
var question = "Do you want to proceed?";
2626
var yes = "Yes, my RabbitMQ broker meets the minimum requirements";
2727
var no = "No, cancel the install";
2828

29-
var continueInstall = await windowManager.ShowYesNoDialog(title, message, question, yes, no);
29+
var message = new StringBuilder();
30+
message.AppendLine($"ServiceControl version {Constants.CurrentVersion} requires:");
31+
message.AppendLine("• RabbitMQ broker version 3.10.0 or higher");
32+
message.AppendLine("• The stream_queue and quorum_queue feature flags must be enabled");
33+
message.AppendLine($"• The management plugin API must be enabled and accessible. This might require custom settings to be added to the connection string before {beforeWhat}. See the ServiceControl documentation for details.");
34+
message.AppendLine();
35+
message.AppendLine($"Please confirm your broker meets the minimum requirements before {beforeWhat}.");
36+
37+
var continueInstall = await windowManager.ShowYesNoDialog(title, message.ToString(), question, yes, no);
3038
return continueInstall;
3139
}
3240

src/ServiceControl.Management.PowerShell/Validation/PowerShellCommandChecks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected override Task<bool> PromptForRabbitMqCheck(bool isUpgrade)
8181

8282
if (!acknowledgements.Any(ack => ack.Equals(AcknowledgementValues.RabbitMQManagementApi, StringComparison.OrdinalIgnoreCase)))
8383
{
84-
var terminateMsg = $"ServiceControl version {Constants.CurrentVersion} requires that the management plugin be enabled and the management API be accessible. Use -Acknowledgements {AcknowledgementValues.RabbitMQManagementApi} if you are sure your broker meets these requirements.";
84+
var terminateMsg = $"ServiceControl version {Constants.CurrentVersion} requires that the management plugin API must be enabled and accessible. This might require custom settings to be added to the connection string. See the ServiceControl documentation for details. Use -Acknowledgements {AcknowledgementValues.RabbitMQManagementApi} if you are sure your broker meets these requirements.";
8585

8686
Terminate(terminateMsg, "Install Error", ErrorCategory.InvalidArgument);
8787
return Task.FromResult(false);

0 commit comments

Comments
 (0)