Tweaked log level resolving to treat null source as ''

Author: niemyjski

src/Exceptionless/Extensions/StringExtensions.cs

@@ -64,7 +64,7 @@ public static bool IsPatternMatch(this string value, string pattern, bool ignore
             if (endsWithWildcard)
                 return value.StartsWith(pattern);
 
-            return value.Equals(pattern);
+            return String.Equals(value, pattern);
         }
 
         public static string[] SplitAndTrim(this string input, params char[] separator) {

src/Exceptionless/Models/Collections/SettingsDictionary.cs

@@ -193,22 +193,22 @@ protected override void OnChanged(ChangedEventArgs<KeyValuePair<string, string>>
 
         private readonly ConcurrentDictionary<string, LogLevel> _minLogLevels = new ConcurrentDictionary<string, LogLevel>(StringComparer.OrdinalIgnoreCase);
 
-        public LogLevel GetMinLogLevel(string loggerName) {
-            if (loggerName == null)
-                loggerName = "*";
+        public LogLevel GetMinLogLevel(string source) {
+            if (source == null)
+                source = String.Empty;
 
             LogLevel minLogLevel;
-            if (_minLogLevels.TryGetValue(loggerName, out minLogLevel))
+            if (_minLogLevels.TryGetValue(source, out minLogLevel))
                 return minLogLevel;
 
-            string setting = GetTypeAndSourceSetting("log", loggerName, "Trace");
+            string setting = GetTypeAndSourceSetting("log", source, "Trace");
             if (setting == null) {
-                _minLogLevels.AddOrUpdate(loggerName, LogLevel.Trace, (logName, level) => LogLevel.Trace);
+                _minLogLevels.AddOrUpdate(source, LogLevel.Trace, (logName, level) => LogLevel.Trace);
                 return LogLevel.Trace;
             }
 
             minLogLevel = LogLevel.FromString(setting);
-            _minLogLevels.AddOrUpdate(loggerName, minLogLevel, (logName, level) => minLogLevel);
+            _minLogLevels.AddOrUpdate(source, minLogLevel, (logName, level) => minLogLevel);
             return minLogLevel;
         }
 

test/Exceptionless.Tests/Plugins/PluginTests.cs

@@ -152,7 +152,7 @@ public void EventExclusionPlugin_EventExclusions() {
         [InlineData("Test", "Trace", null, null, false)]
         [InlineData("Test", "Off", null, null, true)]
         [InlineData("Test", "Abc", null, null, false)]
-        [InlineData(null, "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix, "Off", false)]
+        [InlineData(null, "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix, "Off", true)]
         [InlineData(null, "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix + "*", "Off", true)]
         [InlineData("", "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix, "Off", true)] // Becomes Global Log Level
         [InlineData("", "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix + "*", "Off", true)]
@@ -185,7 +185,7 @@ public void EventExclusionPlugin_LogLevels(string source, string level, string s
         [Fact]
         public void EventExclusionPlugin_LogLevels_GetMinLogLevel_Settings_Order() {
             var settings = new SettingsDictionary {{"@@log:", "Info"}, {"@@log:*", "Debug"}};
-            Assert.Equal(LogLevel.Debug, settings.GetMinLogLevel(null));
+            Assert.Equal(LogLevel.Info, settings.GetMinLogLevel(null));
             Assert.Equal(LogLevel.Info, settings.GetMinLogLevel(String.Empty));
             Assert.Equal(LogLevel.Debug, settings.GetMinLogLevel("*"));
 
@@ -202,7 +202,8 @@ public void EventExclusionPlugin_LogLevels_GetMinLogLevel_Settings_Order() {
                 { "@@log:abc.def.ghi", "Trace" }
             };
 
-            Assert.Equal(LogLevel.Fatal, settings.GetMinLogLevel(null));
+            Assert.Equal(LogLevel.Fatal, settings.GetMinLogLevel("other"));
+            Assert.Equal(LogLevel.Debug, settings.GetMinLogLevel(null));
             Assert.Equal(LogLevel.Debug, settings.GetMinLogLevel(String.Empty));
             Assert.Equal(LogLevel.Off, settings.GetMinLogLevel("abc"));
             Assert.Equal(LogLevel.Info, settings.GetMinLogLevel("abc.def"));