Skip to content

Commit 8dc70d7

Browse files
committed
Revert "Fixes #1526 - If provider connection string is specified use it. (#1540)"
This reverts commit 5033f18.
1 parent cc28f3d commit 8dc70d7

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

src/Exceptionless.Core/Configuration/MessageBusOptions.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ public static MessageBusOptions ReadFromConfiguration(IConfiguration config, App
2626
options.Provider = options.Data.GetString(nameof(options.Provider));
2727

2828
string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
29-
options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
29+
if (!String.IsNullOrEmpty(providerConnectionString))
30+
options.Data.AddRange(providerConnectionString.ParseConnectionString());
31+
32+
options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
3033

3134
return options;
3235
}

src/Exceptionless.Core/Configuration/MetricOptions.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ public static MetricOptions ReadFromConfiguration(IConfiguration config)
2020
options.Provider = options.Data.GetString(nameof(options.Provider));
2121

2222
string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
23-
options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
23+
if (!String.IsNullOrEmpty(providerConnectionString))
24+
options.Data.AddRange(providerConnectionString.ParseConnectionString());
25+
26+
options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
2427

2528
return options;
2629
}

src/Exceptionless.Core/Configuration/QueueOptions.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ public static QueueOptions ReadFromConfiguration(IConfiguration config, AppOptio
2424
options.Provider = options.Data.GetString(nameof(options.Provider));
2525

2626
string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
27-
options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
27+
if (!String.IsNullOrEmpty(providerConnectionString))
28+
options.Data.AddRange(providerConnectionString.ParseConnectionString());
29+
30+
options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
2831

2932
return options;
3033
}

src/Exceptionless.Core/Configuration/StorageOptions.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ public static StorageOptions ReadFromConfiguration(IConfiguration config, AppOpt
2626
options.Provider = options.Data.GetString(nameof(options.Provider));
2727

2828
string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
29-
options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
29+
if (!String.IsNullOrEmpty(providerConnectionString))
30+
options.Data.AddRange(providerConnectionString.ParseConnectionString());
31+
32+
options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
3033

3134
return options;
3235
}

0 commit comments

Comments
 (0)