Fix log-conf.xml (rabbitmq#121)

Author: HzjNeverStop

core/src/main/java/com/alipay/sofa/common/config/log/ConfigLoggerFactory.java

@@ -18,7 +18,6 @@
 
 import com.alipay.sofa.common.log.LoggerSpaceManager;
 import com.alipay.sofa.common.utils.StringUtil;
-import com.alipay.sofa.common.utils.ThreadLoggerFactory;
 import org.slf4j.Logger;
 
 /**
@@ -27,7 +26,7 @@
  */
 public class ConfigLoggerFactory {
 
-    public static final Logger  CONFIG_COMMON_DIGEST_LOGGER = ThreadLoggerFactory
+    public static final Logger  CONFIG_COMMON_DIGEST_LOGGER = ConfigLoggerFactory
                                                                 .getLogger("com.alipay.sofa.common.config.digest");
 
     private static final String COMMON_CONFIG_LOG_SPACE     = "sofa-common-tools";

core/src/main/resources/sofa-common-tools/log/log4j/log-conf.xml

@@ -17,7 +17,7 @@
         <param name="file" value="${logging.path}/sofa-config/common-default.log"/>
         <param name="append" value="true"/>
         <param name="encoding" value="${file.encoding}"/>
-        <param name="threshold" value="${logging.level.com.alipay.sofa.common.config}"/>
+        <param name="threshold" value="${logging.level.sofa-common-tools}"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d %-5p %-5t - %m%n"/>
         </layout>
@@ -29,7 +29,7 @@
     </logger>
 
     <root>
-        <level value="${logging.level.com.alipay.sofa.common.config}"/>
+        <level value="${logging.level.sofa-common-tools}"/>
         <appender-ref ref="COMMON-DEFAULT-APPENDER"/>
     </root>
 </log4j:configuration>

core/src/main/resources/sofa-common-tools/log/log4j2/log-conf.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration status="OFF">
     <Properties>
-        <Property name="CONFIG_LOG_LEVEL">${sys:logging.level.com.alipay.sofa.common.config}</Property>
+        <Property name="CONFIG_LOG_LEVEL">${sys:logging.level.sofa-common-tools}</Property>
         <Property name="CONFIG_LOG_PATH">${sys:logging.path}</Property>
         <Property name="CONFIG_FILE_ENCODING">${sys:file.encoding}</Property>
     </Properties>

core/src/main/resources/sofa-common-tools/log/logback/log-conf.xml

@@ -21,7 +21,7 @@
     <appender name="SOFA-APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <append>true</append>
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>${logging.level.com.alipay.sofa.config}</level>
+            <level>${logging.level.sofa-common-tools}</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
@@ -41,7 +41,7 @@
         <appender-ref ref="SOFA-APPENDER"/>
     </logger>
 
-    <root level="${logging.level.com.alipay.sofa.config}">
+    <root level="${logging.level.sofa-common-tools}">
         <appender-ref ref="DEFAULT-APPENDER"/>
     </root>
 

core/src/main/resources/sofa-thread/log/log4j/log-conf.xml

@@ -16,14 +16,14 @@
         <param name="file" value="${logging.path}/sofa-thread/thread-digest.log"/>
         <param name="append" value="true"/>
         <param name="encoding" value="${file.encoding}"/>
-        <param name="threshold" value="${logging.level.com.alipay.sofa.thread}"/>
+        <param name="threshold" value="${logging.level.sofa-thread}"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d %-5p %-5t - %m%n"/>
         </layout>
     </appender>
 
     <logger name="com.alipay.sofa.thread" additivity="false">
-        <level value="${logging.level.com.alipay.sofa.thread}"/>
+        <level value="${logging.level.sofa-thread}"/>
         <appender-ref ref="SOFA-APPENDER"/>
     </logger>
 
@@ -33,7 +33,7 @@
     </logger>
 
     <root>
-        <level value="${logging.level.com.alipay.sofa.thread}"/>
+        <level value="${logging.level.sofa-thread}"/>
         <appender-ref ref="SOFA-APPENDER"/>
         <appender-ref ref="WARN-APPENDER"/>
     </root>

core/src/main/resources/sofa-thread/log/log4j2/log-conf.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration status="OFF">
     <Properties>
-        <Property name="THREAD_LOG_LEVEL">${sys:logging.level.com.alipay.sofa.thread}</Property>
+        <Property name="THREAD_LOG_LEVEL">${sys:logging.level.sofa-thread}</Property>
         <Property name="THREAD_LOG_PATH">${sys:logging.path}</Property>
         <Property name="THREAD_FILE_ENCODING">${sys:file.encoding}</Property>
     </Properties>

core/src/main/resources/sofa-thread/log/logback/log-conf.xml

@@ -21,7 +21,7 @@
     <appender name="SOFA-APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <append>true</append>
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>${logging.level.com.alipay.sofa.thread}</level>
+            <level>${logging.level.sofa-thread}</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
@@ -36,15 +36,15 @@
         </encoder>
     </appender>
 
-    <logger name="com.alipay.sofa.thread" level="${logging.level.com.alipay.sofa.thread}" additivity="false">
+    <logger name="com.alipay.sofa.thread" level="${logging.level.sofa-thread}" additivity="false">
         <appender-ref ref="SOFA-APPENDER"/>
     </logger>
 
     <logger name="com.alipay.sofa.thread.warn" level="WARN" additivity="false">
         <appender-ref ref="WARN-APPENDER"/>
     </logger>
 
-    <root level="${logging.level.com.alipay.sofa.thread}">
+    <root level="${logging.level.sofa-thread}">
         <appender-ref ref="SOFA-APPENDER"/>
         <appender-ref ref="WARN-APPENDER"/>
     </root>