From fea53d845d8df35b54b0b1e5c854946a5d0a1271 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Fri, 6 Oct 2017 15:21:15 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30553

---
 server/-product/log4j2.xml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/server/-product/log4j2.xml b/server/-product/log4j2.xml
index a250b371..2f63f206 100644
--- a/server/-product/log4j2.xml
+++ b/server/-product/log4j2.xml
@@ -11,32 +11,26 @@
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
 			<Filters>
-				<MarkerFilter marker="teszt1" onMatch="DENY" onMismatch="NEUTRAL" />
-				<MarkerFilter marker="teszt2" onMatch="DENY" onMismatch="NEUTRAL" />
-				<MarkerFilter marker="teszt3" onMatch="DENY" onMismatch="NEUTRAL" />
-				<MarkerFilter marker="teszt4" onMatch="DENY" onMismatch="NEUTRAL" />
+				<MarkerFilter marker="MEDIACUBE" onMatch="DENY" onMismatch="NEUTRAL" />
 			</Filters>
 			<PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %msg (%F:%L) %n" />
 		</Console>
 		<Console name="MarkeredConsole" target="SYSTEM_ERR">
 			<Filters>
-				<MarkerFilter marker="teszt1" onMatch="ACCEPT" onMismatch="NEUTRAL" />
-				<MarkerFilter marker="teszt2" onMatch="ACCEPT" onMismatch="NEUTRAL" />
-				<MarkerFilter marker="teszt3" onMatch="ACCEPT" onMismatch="NEUTRAL" />
-				<MarkerFilter marker="teszt4" onMatch="ACCEPT" onMismatch="DENY" />
+				<MarkerFilter marker="MEDIACUBE" onMatch="ACCEPT" onMismatch="DENY" />
 			</Filters>
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %marker - %msg (%F:%L) %n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %markerSimpleName - %msg (%F:%L) %n" />
 		</Console>
 		<HTMLMailAppender name="MarkeredMail" subject="MediaCube rendszerüzenet" to="vasary@elgekko.net" from="mediacubeserver@gmail.com" smtpHost="smtp.gmail.com"
 			smtpPort="465" smtpProtocol="smtps" smtpUsername="mediacubeserver@gmail.com" smtpPassword="salabakter" ignoreExceptions="false" bufferSize="1">
 			<Filters>
-				<MarkerFilter marker="Archiválás" onMatch="ACCEPT" onMismatch="DENY" />
+				<MarkerFilter marker="MEDIACUBE" onMatch="ACCEPT" onMismatch="DENY" />
 			</Filters>
 			<PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %msg (%F:%L) %n" />
 		</HTMLMailAppender>
 		<RollingFile name="MarkeredRollingFile" fileName="${markeredFileName}" filePattern="${markeredFilePattern}">
 			<Filters>
-				<MarkerFilter marker="Archiválás" onMatch="ACCEPT" onMismatch="DENY" />
+				<MarkerFilter marker="MEDIACUBE" onMatch="DENY" onMismatch="NEUTRAL" />
 			</Filters>
 			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%-5level] [%t] [%M] [%class{36}] %msg%n %throwable{short}" />
 			<Policies>
@@ -44,6 +38,9 @@
 			</Policies>
 		</RollingFile>
 		<RollingFile name="RollingFile" fileName="${fileName}" filePattern="${filePattern}">
+			<Filters>
+				<MarkerFilter marker="MEDIACUBE" onMatch="DENY" onMismatch="NEUTRAL" />
+			</Filters>
 			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%-5level] [%t] [%M] [%class{36}] %msg%n %throwable{short}" />
 			<Policies>
 				<TimeBasedTriggeringPolicy />
@@ -63,10 +60,10 @@
 		<Root level="INFO">
 			<AppenderRef ref="Console" />
 			<AppenderRef ref="MarkeredConsole" />
-- 			<AppenderRef ref="RollingFile" />
-- 			<AppenderRef ref="RollingFileExceptions" />
-- 			<AppenderRef ref="MarkeredRollingFile" />
-<!-- 			<AppenderRef ref="MarkeredMail" /> -->
+ 			<AppenderRef ref="RollingFile" />
+ 			<AppenderRef ref="RollingFileExceptions" />
+ 			<AppenderRef ref="MarkeredRollingFile" />
+			<AppenderRef ref="MarkeredMail" />
 		</Root>
 		<Logger name="org.zkoss" level="ERROR" additivity="false" />
 		<Logger name="org.quartz" level="ERROR" additivity="false" />
-- 
2.54.0