Skip to content

Commit a6606ec

Browse files
committed
Wire up settings that apparently have been lost
1 parent ffaa94f commit a6606ec

File tree

3 files changed

+19
-51
lines changed

3 files changed

+19
-51
lines changed

src/ServiceControl.Transports.RabbitMQ/QueueLengthProvider.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{
33
using System;
44
using System.Collections.Concurrent;
5-
using System.Data.Common;
65
using System.Threading;
76
using System.Threading.Tasks;
87
using global::RabbitMQ.Client;
@@ -109,13 +108,14 @@ public void Initialize()
109108
var connectionConfiguration =
110109
ConnectionConfiguration.Create(connectionString, "ServiceControl.Monitoring");
111110

112-
var dbConnectionStringBuilder = new DbConnectionStringBuilder { ConnectionString = connectionString };
111+
// TODO Fix this up
112+
//var dbConnectionStringBuilder = new DbConnectionStringBuilder { ConnectionString = connectionString };
113113

114114
connectionFactory = new ConnectionFactory("ServiceControl.Monitoring",
115115
connectionConfiguration,
116116
null, //providing certificates is not supported yet
117-
dbConnectionStringBuilder.GetBooleanValue("DisableRemoteCertificateValidation"),
118-
dbConnectionStringBuilder.GetBooleanValue("UseExternalAuthMechanism"),
117+
false,//dbConnectionStringBuilder.GetBooleanValue("DisableRemoteCertificateValidation"),
118+
false, //dbConnectionStringBuilder.GetBooleanValue("UseExternalAuthMechanism"),
119119
null, // value would come from config API in actual transport
120120
null); // value would come from config API in actual transport
121121
}

src/ServiceControl.Transports.RabbitMQ/RabbitMQTransportExtensions.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public static void SetCustomSettingsFromConnectionString(this RabbitMQTransport
1919
.OfType<KeyValuePair<string, object>>()
2020
.ToDictionary(pair => pair.Key, pair => pair.Value.ToString(), StringComparer.OrdinalIgnoreCase);
2121

22-
if (dictionary.TryGetValue("ValidateDeliveryLimits", out var validateString))
22+
if (dictionary.TryGetValue("ValidateDeliveryLimits", out var validateDeliveryLimitsString))
2323
{
24-
_ = bool.TryParse(validateString, out var validate);
25-
transport.ValidateDeliveryLimits = validate;
24+
_ = bool.TryParse(validateDeliveryLimitsString, out var validateDeliveryLimits);
25+
transport.ValidateDeliveryLimits = validateDeliveryLimits;
2626
}
2727

2828
if (dictionary.TryGetValue("ManagementApiUrl", out var url))
@@ -36,5 +36,17 @@ public static void SetCustomSettingsFromConnectionString(this RabbitMQTransport
3636
transport.ManagementApiConfiguration = new(url);
3737
}
3838
}
39+
40+
if (dictionary.TryGetValue("DisableRemoteCertificateValidation", out var disableRemoteCertificateValidationString))
41+
{
42+
_ = bool.TryParse(disableRemoteCertificateValidationString, out var disableRemoteCertificateValidation);
43+
transport.ValidateRemoteCertificate = !disableRemoteCertificateValidation;
44+
}
45+
46+
if (dictionary.TryGetValue("UseExternalAuthMechanism", out var useExternalAuthMechanismString))
47+
{
48+
_ = bool.TryParse(useExternalAuthMechanismString, out var useExternalAuthMechanism);
49+
transport.UseExternalAuthMechanism = useExternalAuthMechanism;
50+
}
3951
}
4052
}

src/ServiceControl.Transports.RabbitMQ/TransportConfigurationExtensions.cs

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)