Merge branch 'kaqq-master'

Author: couchcoding

src/Logbert/App.config

@@ -580,6 +580,24 @@
       <setting name="ColumnizerRepository" serializeAs="String">
         <value>columnizer.xml</value>
       </setting>
+      <setting name="Log4NetLevelTrace" serializeAs="String">
+        <value>TRACE</value>
+      </setting>
+      <setting name="Log4NetLevelDebug" serializeAs="String">
+        <value>DEBUG</value>
+      </setting>
+      <setting name="Log4NetLevelInfo" serializeAs="String">
+        <value>INFO</value>
+      </setting>
+      <setting name="Log4NetLeveLWarning" serializeAs="String">
+        <value>WARN</value>
+      </setting>
+      <setting name="Log4NetLevelError" serializeAs="String">
+        <value>ERROR</value>
+      </setting>
+      <setting name="Log4NetLevelFatal" serializeAs="String">
+        <value>FATAL</value>
+      </setting>
     </Couchcoding.Logbert.Properties.Settings>
   </applicationSettings>
 </configuration>

src/Logbert/Logbert.csproj

@@ -30,6 +30,21 @@
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -642,6 +657,13 @@
       <Name>Couchcoding.Logbert.Theme</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Logbert/Logging/LogMessageLog4Net.cs

@@ -38,6 +38,7 @@
 
 using MoonSharp.Interpreter;
 using System.Globalization;
+using System.Text.RegularExpressions;
 
 namespace Couchcoding.Logbert.Logging
 {
@@ -249,7 +250,7 @@ private bool ParseData(string data)
           }
 
           long timestamp;
-          mTimestamp = long.TryParse(reader.GetAttribute("timestamp"), out timestamp) 
+          mTimestamp = long.TryParse(reader.GetAttribute("timestamp"), out timestamp)
             ? mUtcStartDate.AddMilliseconds(timestamp)
             : DateTime.Now;
 
@@ -327,20 +328,29 @@ private LogLevel MapLevelType(string levelType)
     {
       if (!string.IsNullOrEmpty(levelType))
       {
-        switch (levelType.ToUpper())
+        if (Regex.IsMatch(levelType, Settings.Default.Log4NetLevelDebug))
         {
-          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.Debug;
+        }
+
+        if (Regex.IsMatch(levelType, Settings.Default.Log4NetLevelInfo))
+        {
+          return LogLevel.Info;
+        }
+
+        if (Regex.IsMatch(levelType, Settings.Default.Log4NetLeveLWarning))
+        {
+          return LogLevel.Warning;
+        }
+
+        if (Regex.IsMatch(levelType, Settings.Default.Log4NetLevelError))
+        {
+          return LogLevel.Error;
+        }
+
+        if (Regex.IsMatch(levelType, Settings.Default.Log4NetLevelFatal))
+        {
+          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="Log4NetLevelTrace" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">TRACE</Value>
+    </Setting>
+    <Setting Name="Log4NetLevelDebug" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">DEBUG</Value>
+    </Setting>
+    <Setting Name="Log4NetLevelInfo" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">INFO</Value>
+    </Setting>
+    <Setting Name="Log4NetLeveLWarning" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">WARN</Value>
+    </Setting>
+    <Setting Name="Log4NetLevelError" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">ERROR</Value>
+    </Setting>
+    <Setting Name="Log4NetLevelFatal" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">FATAL</Value>
+    </Setting>
   </Settings>
-</SettingsFile>
+</SettingsFile>