Merge branch 'master' of git://github.com/kaqq/Logbert into kaqq-master

Author: couchcoding

src/Logbert/App.config

@@ -579,6 +579,24 @@
     <Couchcoding.Logbert.Properties.Settings>
       <setting name="ColumnizerRepository" serializeAs="String">
         <value>columnizer.xml</value>
+      </setting>
+         <setting name="LevelTRACE" serializeAs="String">
+        <value>TRACE;</value>
+      </setting>
+      <setting name="LevelDEBUG" serializeAs="String">
+        <value>DEBUG;</value>
+      </setting>
+      <setting name="LevelINFO" serializeAs="String">
+        <value>INFO;</value>
+      </setting>
+      <setting name="LevelWARN" serializeAs="String">
+        <value>WARN;</value>
+      </setting>
+      <setting name="LevelERROR" serializeAs="String">
+        <value>ERROR;</value>
+      </setting>
+      <setting name="LevelFATAL" serializeAs="String">
+        <value>FATAL;</value>
       </setting>
     </Couchcoding.Logbert.Properties.Settings>
   </applicationSettings>

src/Logbert/Logging/LogMessageLog4Net.cs

@@ -325,22 +325,29 @@ private bool ParseData(string data)
     /// <returns>The mapped <see cref="LogLevel"/>.</returns>
     private LogLevel MapLevelType(string levelType)
     {
-      if (!string.IsNullOrEmpty(levelType))
+       if (!string.IsNullOrEmpty(levelType))
       {
-        switch (levelType.ToUpper())
+        var level = levelType;
+        if (Settings.Default.LevelTRACE.Split(';').Any(x=>String.Equals(x,level,StringComparison.CurrentCultureIgnoreCase)))
         {
-          case "TRACE":
-            return LogLevel.Trace;
-          case "DEBUG":
-            return LogLevel.Debug;
-          case "INFO":
-            return LogLevel.Info;
-          case "WARN":
-            return LogLevel.Warning;
-          case "ERROR":
-            return LogLevel.Error;
-          case "FATAL":
-            return LogLevel.Fatal;
+          return LogLevel.Trace;
+        }
+        else if (Settings.Default.LevelDEBUG.Split(';').Any(x => String.Equals(x, level, StringComparison.CurrentCultureIgnoreCase)))
+
+        {
+          return LogLevel.Debug;
+        }
+        else if (Settings.Default.LevelINFO.Split(';').Any(x => String.Equals(x, level, StringComparison.CurrentCultureIgnoreCase)))
+        {
+          return LogLevel.Info;
+        }
+        else if (Settings.Default.LevelWARN.Split(';').Any(x => String.Equals(x, level, StringComparison.CurrentCultureIgnoreCase)))
+        {
+          return LogLevel.Warning;
+        }
+        else if (Settings.Default.LevelFATAL.Split(';').Any(x => String.Equals(x, level, StringComparison.CurrentCultureIgnoreCase)))
+        {
+          return LogLevel.Fatal;
         }
       }
 

src/Logbert/Properties/Settings.Designer.cs

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Couchcoding.Logbert.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
@@ -536,5 +536,23 @@
     <Setting Name="FrmMainShowWelcomePage" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="LevelTRACE" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">TRACE;</Value>
+    </Setting>
+    <Setting Name="LevelDEBUG" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">DEBUG;</Value>
+    </Setting>
+    <Setting Name="LevelINFO" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">INFO;</Value>
+    </Setting>
+    <Setting Name="LevelWARN" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">WARN;</Value>
+    </Setting>
+    <Setting Name="LevelERROR" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">ERROR;</Value>
+    </Setting>
+    <Setting Name="LevelFATAL" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">FATAL;</Value>
+    </Setting>
   </Settings>
-</SettingsFile>
+</SettingsFile>