From dc5afadd53c52173d998479cf5574baec40ff40a Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Wed, 18 May 2016 11:23:52 +0200
Subject: [PATCH] Munich, ver.2.6.282

---
 TestBenchFramework/Properties/AssemblyInfo.cs |  4 +-
 .../SampleConfig/log4netConfig.xml            | 43 +++++--------------
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 1db7a43d3..79ca7c3c5 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.6.281.1")]
-[assembly: AssemblyFileVersion("2.6.281.1")]
+[assembly: AssemblyVersion("2.6.282.1")]
+[assembly: AssemblyFileVersion("2.6.282.1")]
diff --git a/TestBenchFramework/SampleConfig/log4netConfig.xml b/TestBenchFramework/SampleConfig/log4netConfig.xml
index 5d636da1b..5726ded64 100644
--- a/TestBenchFramework/SampleConfig/log4netConfig.xml
+++ b/TestBenchFramework/SampleConfig/log4netConfig.xml
@@ -1,12 +1,4 @@
 <log4net>
-    <!-- A1 is set to be a ConsoleAppender -->
-    <appender name="A1" type="log4net.Appender.ConsoleAppender">
-        <!-- A1 uses PatternLayout -->
-        <layout type="log4net.Layout.PatternLayout">
-            <conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
-        </layout>
-    </appender>
-
     <!-- Process data appenders -->
 	<appender name="RfidData" type="log4net.Appender.RollingFileAppender">
 		<file value="C:\TBF\ProcessData\RfidData.log" />
@@ -46,17 +38,8 @@
 	</appender>
 
     <!-- Program log appenders -->
-	<appender name="LogFile-UI" type="log4net.Appender.RollingFileAppender">
-		<file value="C:\TBF\Logs\Log-UI.txt" />
-		<appendToFile value="true" />
-		<rollingMode value="Date" />
-		<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-		<layout type="log4net.Layout.PatternLayout">
-			<conversionPattern value="%date %-5level %logger - %message%newline" />
-		</layout>
-	</appender>
-	<appender name="LogFile-WT" type="log4net.Appender.RollingFileAppender">
-		<file value="C:\TBF\Logs\Log-WT.txt" />
+	<appender name="TbfLog" type="log4net.Appender.RollingFileAppender">
+		<file value="C:\TBF\Logs\TbfLog.txt" />
 		<appendToFile value="true" />
 		<rollingMode value="Date" />
 		<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
@@ -77,22 +60,16 @@
 	<logger name="ProcessData"><level value="INFO" /><appender-ref ref="ProcessData" /></logger>
 	<logger name="RfidData"><level value="INFO" /><appender-ref ref="RfidData" /></logger>
 
+
     <!-- Set program loggers -->
+	<logger name="TBF"> <appender-ref ref="TbfLog" /> <level value="WARN" /> </logger>
+	<logger name="Config"> <appender-ref ref="TbfLog" /> <level value="WARN" /> </logger>
+	<logger name="Results"> <appender-ref ref="TbfLog" /> <level value="WARN" /> </logger>
+
+    <!-- Set program logging levels -->
 	<logger name="NHibernate"> <level value="ERROR" /> </logger>
-	<logger name="TBF.BenchControl">
-	    <appender-ref ref="A1" />
-		<appender-ref ref="LogFile-WT" /> <level value="WARN" />
-	</logger>
+	<logger name="TBF.BenchControl.Elde.RegulValve.SetFlowOp"> <level value="DEBUG" /> </logger>
+	<logger name="TBF.BenchControl.MettlerToledo"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.StateMachine"> <level value="INFO" /> </logger>
 	<logger name="TBF.BenchControl.State"> <level value="INFO" /> </logger>
-	<logger name="TBF.BenchControl.Elde.ControlBoardWrap"> <level value="DEBUG" /> </logger>
-	<logger name="TBF.BenchControl.Elde.Pump"> <level value="DEBUG" /> </logger>
-	<logger name="TBF.BenchControl.Elde.PumpWithFM"> <level value="DEBUG" /> </logger>
-	
-	<logger name="TBF.BenchControl.MettlerToledo"> <level value="INFO" /> </logger>
-	<logger name="TBF.BenchControl.MettlerToledo.ReadMassOp"> <level value="WARN" /> </logger>
-	<logger name="TBF.BenchControl.MettlerToledo.ReadStableMassOp"> <level value="WARN" /> </logger>
-	
-	<logger name="TBF.BenchControl.IdcCamera"> <level value="INFO" /> </logger>
-	<logger name="TBF.BenchControl.Elde.StartMeasurementOp"> <level value="DEBUG" /> </logger>
 </log4net>