Skip to content

Commit 92f1121

Browse files
committed
Fixes #1526 - If provider connection string is specified use it.
1 parent c148973 commit 92f1121

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

src/Exceptionless.Core/Configuration/MessageBusOptions.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ 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-
if (!String.IsNullOrEmpty(providerConnectionString))
30-
options.Data.AddRange(providerConnectionString.ParseConnectionString());
31-
32-
options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
29+
options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
3330

3431
return options;
3532
}

src/Exceptionless.Core/Configuration/MetricOptions.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ 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-
if (!String.IsNullOrEmpty(providerConnectionString))
24-
options.Data.AddRange(providerConnectionString.ParseConnectionString());
25-
26-
options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
23+
options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
2724

2825
return options;
2926
}

src/Exceptionless.Core/Configuration/QueueOptions.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ 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-
if (!String.IsNullOrEmpty(providerConnectionString))
28-
options.Data.AddRange(providerConnectionString.ParseConnectionString());
29-
30-
options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
27+
options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
3128

3229
return options;
3330
}

src/Exceptionless.Core/Configuration/StorageOptions.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ 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-
if (!String.IsNullOrEmpty(providerConnectionString))
30-
options.Data.AddRange(providerConnectionString.ParseConnectionString());
31-
32-
options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
29+
options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
3330

3431
return options;
3532
}

0 commit comments

Comments
 (0)