#22 - upgrade slf4j and logback.

misterthaihuynh · Nov 7, 2014 · e8883b8 · e8883b8
1 parent c3a4a5e
commit e8883b8
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -133,12 +133,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.6.1</version>
+            <version>1.7.7</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.27</version>
+            <version>1.1.2</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -1,39 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger{35} - %msg%n</pattern>
-        </layout>
-    </appender>
+<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+</appender>
 
-    <!--Daily rolling file appender -->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>logs/UserAdminWebApp.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>logs/UserAdminWebApp-%d{yyyy-MM-dd}.log</FileNamePattern>
-            <maxHistory>5</maxHistory>
-        </rollingPolicy>
+<!--Daily rolling file appender -->
+<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <File>logs/UserAdminWebApp.log</File>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <FileNamePattern>logs/UserAdminWebApp-%d{yyyy-MM-dd}.log</FileNamePattern>
+        <maxHistory>5</maxHistory>
+    </rollingPolicy>
 
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{HH:mm:ss.SSS} %-5level %logger{35} - %msg%n</Pattern>
-        </layout>
-    </appender>
+    <encoder>
+        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+</appender>
 
 
-    <logger name="org.apache.directory" level="WARN" additivity="false">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </logger>
+<logger name="org.eclipse.jetty" level="WARN" />
 
+<logger name="net.whydah.identity.admin" level="TRACE" />
 
-    <logger name="net.whydah.identity" level="TRACE" additivity="false">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </logger>
-
-    <root>
-        <level value="INFO" />
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </root>
+<root level="INFO">
+    <appender-ref ref="STDOUT" />
+    <appender-ref ref="FILE" />
+</root>
 </configuration>
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="net.whydah.identity.admin" level="TRACE" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>