git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

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