Polish alibaba#94 : adapter modular logback whether current applicati…

…on is Spring or Spring Boot
sk163 · Oct 2, 2018 · 0424a4a · 0424a4a
1 parent e91ccc9
commit 0424a4a
Show file tree

Hide file tree

Showing 10 changed files with 423 additions and 338 deletions.
diff --git a/config/pom.xml b/config/pom.xml
@@ -154,7 +154,6 @@
         </plugins>
         <resources>
             <resource>
-                <filtering>true</filtering>
                 <directory>src/main/resources</directory>
                 <excludes>
                     <exclude>application.properties</exclude>

diff --git a/...m/alibaba/nacos/config/server/Config.java → ...m/alibaba/nacos/config/server/Config.java b/...m/alibaba/nacos/config/server/Config.java → ...m/alibaba/nacos/config/server/Config.java
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/LogUtil.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/LogUtil.java
@@ -15,9 +15,6 @@
  */
 package com.alibaba.nacos.config.server.utils;
 
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.core.joran.spi.JoranException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,30 +25,6 @@
  */
 public class LogUtil {
 
-	static {
-		LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
-		lc.reset();
-
-		JoranConfigurator configurator = new JoranConfigurator();
-
-		String nacosDir = System.getProperty("nacos.home");
-		if (StringUtils.isBlank(nacosDir)) {
-			configurator.setContext(lc);
-			try {
-				configurator.doConfigure(LogUtil.class.getResource("/nacos-config-logback.xml"));
-			} catch (JoranException e) {
-				System.err.println("init logger fail by nacos-config-logback.xml");
-			}
-		} else {
-			configurator.setContext(lc);
-			try {
-				configurator.doConfigure(nacosDir + "/conf/nacos-logback.xml");
-			} catch (JoranException e) {
-				System.err.println("init logger fail by " + nacosDir + "/conf/nacos-logback.xml");
-			}
-		}
-	}
-
     /**
      * 默认的日志
      */