iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/470' into pr/470-alexB-logging

Browse Source 
Conflicts:
	log4j/pom.xml
	log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
	log4j/src/main/java/com/baeldung/logback/LogbackExample.java
	log4j/src/main/resources/log4j.xml
	log4j/src/main/resources/log4j2.xml
	log4j/src/main/resources/logback.xml
	pom.xml
This commit is contained in:
Slavisa Baeldung
2016-07-08 09:51:18 +02:00
parent acaa70c66d 980a3bdd33
commit 57ebe60697
76 changed files with 1027 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
+1 -1
View File
@@ -13,4 +13,4 @@ public class Log4j2Example {
logger.error("Error log message");
}
}
}
log4j/src/main/java/com/baeldung/logback/LogbackExample.java
+2 -2
View File
@@ -1,6 +1,5 @@
package com.baeldung.logback;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -13,4 +12,5 @@ public class LogbackExample {
logger.info("Info log message");
logger.error("Error log message");
}
}
}
log4j/src/main/resources/log4j.xml
+1
View File
@@ -14,6 +14,7 @@
<param name="append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n"/>
<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %p %m%n" />
</layout>
</appender>
log4j/src/main/resources/log4j2.xml
+5 -5
View File
@@ -4,23 +4,23 @@
# Console appender
<Console name="stdout" target="SYSTEM_OUT">
# Pattern of log message for console appender
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n" />
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %p %m%n" />
</Console>
# File appender
<File name="fout" fileName="log4j/target/baeldung-log4j2.log" immediateFlush="false" append="false">
# Pattern of log message for file appender
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n"/>
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %p %m%n"/>
</File>
</Appenders>
<Loggers>
# Override log level for specified package
<Logger name="com.baeldung.log4j2" level="ERROR"/>
<Logger name="com.baeldung.log4j2" level="TRACE"/>
<Root level="DEBUG">
<AsyncRoot level="DEBUG">
<AppenderRef ref="stdout" />
<AppenderRef ref="fout"/>
</Root>
</AsyncRoot>
</Loggers>
</Configuration>
log4j/src/main/resources/logback.xml
+3 -3
View File
@@ -3,7 +3,7 @@
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
# Pattern of log message for console appender
<Pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n</Pattern>
<Pattern>%d{yyyy-MM-dd HH:mm:ss} %p %m%n</Pattern>
</layout>
</appender>
@@ -14,12 +14,12 @@
<append>false</append>
<encoder>
# Pattern of log message for file appender
<pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n</pattern>
<pattern>%d{yyyy-MM-dd HH:mm:ss} %p %m%n</pattern>
</encoder>
</appender>
# Override log level for specified package
<logger name="com.baeldung.logback" level="ERROR"/>
<logger name="com.baeldung.logback" level="TRACE"/>
<root level="DEBUG">
<appender-ref ref="stdout" />