Merge remote-tracking branch 'refs/remotes/origin/master' into feature/excludes

Author: niemyjski

Source/Extras/Extensions/ExceptionlessExtraConfigurationExtensions.cs

@@ -90,7 +90,8 @@ public static void ReadFromConfigSection(this ExceptionlessConfiguration config)
             if (section == null)
                 return;
 
-            config.Enabled = section.Enabled;
+            if (!section.Enabled)
+                config.Enabled = false;
 
             if (IsValidApiKey(section.ApiKey))
                 config.ApiKey = section.ApiKey;
@@ -171,8 +172,8 @@ public static void ReadFromAppSettings(this ExceptionlessConfiguration config) {
                 config.ApiKey = apiKey;
 
             bool enabled;
-            if (Boolean.TryParse(ConfigurationManager.AppSettings["Exceptionless:Enabled"], out enabled))
-                config.Enabled = enabled;
+            if (Boolean.TryParse(ConfigurationManager.AppSettings["Exceptionless:Enabled"], out enabled) && !enabled)
+                config.Enabled = false;
 
             string serverUrl = ConfigurationManager.AppSettings["Exceptionless:ServerUrl"];
             if (!String.IsNullOrEmpty(serverUrl))
@@ -189,8 +190,8 @@ public static void ReadFromEnvironmentalVariables(this ExceptionlessConfiguratio
                 config.ApiKey = apiKey;
 
             bool enabled;
-            if (Boolean.TryParse(GetEnvironmentalVariable("Exceptionless:Enabled"), out enabled))
-                config.Enabled = enabled;
+            if (Boolean.TryParse(GetEnvironmentalVariable("Exceptionless:Enabled"), out enabled) && !enabled)
+                config.Enabled = false;
 
             string serverUrl = GetEnvironmentalVariable("Exceptionless:ServerUrl");
             if (!String.IsNullOrEmpty(serverUrl))

Source/Shared/Extensions/ExceptionlessConfigurationExtensions.cs

@@ -171,7 +171,8 @@ public static void ReadFromAttributes(this ExceptionlessConfiguration config, IC
 
                     var attr = attributes[0] as ExceptionlessAttribute;
 
-                    config.Enabled = attr.Enabled;
+                    if (!attr.Enabled)
+                        config.Enabled = false;
 
                     if (!String.IsNullOrEmpty(attr.ApiKey) && attr.ApiKey != "API_KEY_HERE")
                         config.ApiKey = attr.ApiKey;