Merge pull request #68 from stackify/bug/RT-751

RT-751: StackifyLib.Config.LoadSettings overrides any explicit ApiKey…
stackify · Feb 7, 2018 · 464d5b6 · 464d5b6
2 parents 5e5b447 + f486f64
commit 464d5b6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/Src/StackifyLib/Config.cs b/Src/StackifyLib/Config.cs
@@ -11,7 +11,7 @@ namespace StackifyLib
     /// </summary>
     public class Config
     {
-        #if NETCORE || NETCOREX
+#if NETCORE || NETCOREX
 
         private static Microsoft.Extensions.Configuration.IConfigurationRoot _configuration = null;
 
@@ -20,7 +20,7 @@ public static void SetConfiguration(Microsoft.Extensions.Configuration.IConfigur
             _configuration = configuration;
         }
 
-        #endif
+#endif
 
         static Config()
         {
@@ -31,21 +31,21 @@ public static void LoadSettings()
         {
             try
             {
-                CaptureErrorPostdata = Get("Stackify.CaptureErrorPostdata", string.Empty).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
+                CaptureErrorPostdata = Get("Stackify.CaptureErrorPostdata", bool.FalseString).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
 
-                CaptureServerVariables = Get("Stackify.CaptureServerVariables", string.Empty).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
+                CaptureServerVariables = Get("Stackify.CaptureServerVariables", bool.FalseString).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
 
-                CaptureSessionVariables = Get("Stackify.CaptureSessionVariables", string.Empty).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
+                CaptureSessionVariables = Get("Stackify.CaptureSessionVariables", bool.FalseString).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
 
                 CaptureErrorHeaders = Get("Stackify.CaptureErrorHeaders", bool.TrueString).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
 
-                CaptureErrorCookies = Get("Stackify.CaptureErrorCookies", string.Empty).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
+                CaptureErrorCookies = Get("Stackify.CaptureErrorCookies", bool.FalseString).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
 
-                ApiKey = Get("Stackify.ApiKey", string.Empty);
+                ApiKey = Get("Stackify.ApiKey", ApiKey ?? string.Empty);
 
-                AppName = Get("Stackify.AppName", string.Empty);
+                AppName = Get("Stackify.AppName", AppName ?? string.Empty);
 
-                Environment = Get("Stackify.Environment", string.Empty);
+                Environment = Get("Stackify.Environment", Environment ?? string.Empty);
 
                 CaptureErrorHeadersWhitelist = Get("Stackify.CaptureErrorHeadersWhitelist", string.Empty);
 
@@ -154,21 +154,21 @@ internal static string Get(string key, string defaultValue = null)
 
             try
             {
-                if (key != null)
+                if (string.IsNullOrWhiteSpace(key) == false)
                 {
 #if NETCORE || NETCOREX
                     if (_configuration != null)
                     {
                         var appSettings = _configuration.GetSection("Stackify");
-                        v = appSettings[key.Replace("Stackify.", "")];
+                        v = appSettings[key.Replace("Stackify.", string.Empty)];
                     }
 #endif
 
 #if NETCOREX
                     if (_configuration != null)
                     {
                         var appSettings = _configuration.GetSection("Stackify");
-                        v = appSettings[key.Replace("Stackify.", "")];
+                        v = appSettings[key.Replace("Stackify.", string.Empty)];
                     }
 #endif
 

diff --git a/Src/StackifyLib/StackifyLib.csproj b/Src/StackifyLib/StackifyLib.csproj
@@ -13,15 +13,15 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <Version>2.1.1</Version>
+    <Version>2.1.2</Version>
     <Authors>StackifyLib</Authors>
     <PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/stackify/stackify-api-dotnet</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
-    <AssemblyVersion>2.1.1.0</AssemblyVersion>
-    <FileVersion>2.1.1.0</FileVersion>
+    <AssemblyVersion>2.1.2.0</AssemblyVersion>
+    <FileVersion>2.1.2.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>