Revert "Fixes #1526 - If provider connection string is specified use …

…it. (#1540)" This reverts commit 5033f18.
exceptionless · Apr 7, 2024 · 8dc70d7 · 8dc70d7
1 parent cc28f3d
commit 8dc70d7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/Exceptionless.Core/Configuration/MessageBusOptions.cs b/src/Exceptionless.Core/Configuration/MessageBusOptions.cs
@@ -26,7 +26,10 @@ public static MessageBusOptions ReadFromConfiguration(IConfiguration config, App
         options.Provider = options.Data.GetString(nameof(options.Provider));
 
         string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
-        options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
+        if (!String.IsNullOrEmpty(providerConnectionString))
+            options.Data.AddRange(providerConnectionString.ParseConnectionString());
+
+        options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
 
         return options;
     }

diff --git a/src/Exceptionless.Core/Configuration/MetricOptions.cs b/src/Exceptionless.Core/Configuration/MetricOptions.cs
@@ -20,7 +20,10 @@ public static MetricOptions ReadFromConfiguration(IConfiguration config)
         options.Provider = options.Data.GetString(nameof(options.Provider));
 
         string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
-        options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
+        if (!String.IsNullOrEmpty(providerConnectionString))
+            options.Data.AddRange(providerConnectionString.ParseConnectionString());
+
+        options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
 
         return options;
     }

diff --git a/src/Exceptionless.Core/Configuration/QueueOptions.cs b/src/Exceptionless.Core/Configuration/QueueOptions.cs
@@ -24,7 +24,10 @@ public static QueueOptions ReadFromConfiguration(IConfiguration config, AppOptio
         options.Provider = options.Data.GetString(nameof(options.Provider));
 
         string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
-        options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
+        if (!String.IsNullOrEmpty(providerConnectionString))
+            options.Data.AddRange(providerConnectionString.ParseConnectionString());
+
+        options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
 
         return options;
     }

diff --git a/src/Exceptionless.Core/Configuration/StorageOptions.cs b/src/Exceptionless.Core/Configuration/StorageOptions.cs
@@ -26,7 +26,10 @@ public static StorageOptions ReadFromConfiguration(IConfiguration config, AppOpt
         options.Provider = options.Data.GetString(nameof(options.Provider));
 
         string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
-        options.ConnectionString = !String.IsNullOrEmpty(providerConnectionString) ? providerConnectionString : options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
+        if (!String.IsNullOrEmpty(providerConnectionString))
+            options.Data.AddRange(providerConnectionString.ParseConnectionString());
+
+        options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });
 
         return options;
     }