From b2c101aaecd34339afcc4844311f37280d03d48e Mon Sep 17 00:00:00 2001
From: Jason Song <nobodyiam@gmail.com>
Date: Sun, 19 Dec 2021 21:52:32 +0800
Subject: [PATCH] refactor(apollo-demo): use logback (#4163)

---
 apollo-demo/pom.xml                           | 22 ---------------
 .../resources/{log4j2.xml => logback.xml}     | 28 ++++++-------------
 2 files changed, 8 insertions(+), 42 deletions(-)
 rename apollo-demo/src/main/resources/{log4j2.xml => logback.xml} (50%)

diff --git a/apollo-demo/pom.xml b/apollo-demo/pom.xml
index 0bc0425cf19..7a358583bfa 100644
--- a/apollo-demo/pom.xml
+++ b/apollo-demo/pom.xml
@@ -44,34 +44,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j2</artifactId>
 		</dependency>
     <!-- for refresh scope demo -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-context</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
-		</dependency>
 		<!-- take over jcl -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
diff --git a/apollo-demo/src/main/resources/log4j2.xml b/apollo-demo/src/main/resources/logback.xml
similarity index 50%
rename from apollo-demo/src/main/resources/log4j2.xml
rename to apollo-demo/src/main/resources/logback.xml
index 39c985375a7..802c8a47efe 100644
--- a/apollo-demo/src/main/resources/log4j2.xml
+++ b/apollo-demo/src/main/resources/logback.xml
@@ -15,24 +15,12 @@
   ~ limitations under the License.
   ~
 -->
-<configuration monitorInterval="60">
-  <appenders>
-    <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="[apollo-demo][%t]%d %-5p [%c] %m%n"/>
-    </Console>
-    <Async name="Async" includeLocation="true">
-      <AppenderRef ref="Console"/>
-    </Async>
-  </appenders>
-  <loggers>
-    <logger name="com.ctrip.framework.apollo" additivity="false" level="INFO">
-      <AppenderRef ref="Async"/>
-    </logger>
-    <logger name="com.ctrip.framework.apollo.demo" additivity="false" level="DEBUG">
-      <AppenderRef ref="Async"/>
-    </logger>
-    <root level="INFO">
-      <AppenderRef ref="Async"/>
-    </root>
-  </loggers>
+<configuration>
+  <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+  <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+	<logger name="com.ctrip.framework.apollo" level="INFO"/>
+	<logger name="com.ctrip.framework.apollo.demo" level="DEBUG"/>
+	<root level="INFO">
+    <appender-ref ref="CONSOLE"/>
+  </root>
 </configuration>