diff --git a/src/main/java/com/alipay/oceanbase/rpc/util/TableClientLoggerFactory.java b/src/main/java/com/alipay/oceanbase/rpc/util/TableClientLoggerFactory.java index 4bcb1fbb..36c8edb0 100644 --- a/src/main/java/com/alipay/oceanbase/rpc/util/TableClientLoggerFactory.java +++ b/src/main/java/com/alipay/oceanbase/rpc/util/TableClientLoggerFactory.java @@ -18,10 +18,9 @@ package com.alipay.oceanbase.rpc.util; import com.alipay.sofa.common.code.LogCode2Description; -import com.alipay.sofa.common.log.MultiAppLoggerSpaceManager; -import com.alipay.sofa.common.log.adapter.level.AdapterLevel; import org.slf4j.Logger; import org.slf4j.helpers.NOPLogger; +import org.slf4j.LoggerFactory; import java.util.Map; @@ -52,13 +51,7 @@ public static Logger getLogger(String name) { return null; } - if (!MultiAppLoggerSpaceManager.isSpaceInitialized(OCEANBASE_TABLE_CLIENT_LOGGER_SPACE)) { - //initLogger(); - MultiAppLoggerSpaceManager.init(OCEANBASE_TABLE_CLIENT_LOGGER_SPACE, null); - } - - return MultiAppLoggerSpaceManager.getLoggerBySpace(name, - OCEANBASE_TABLE_CLIENT_LOGGER_SPACE); + return LoggerFactory.getLogger(name); } public static Logger getLogger(Class klass) { @@ -100,15 +93,4 @@ public static Logger getDIRECTLogger() { return DIRECT; } - - public static void changeLevel(Map levelMap) { - for (Map.Entry entry : levelMap.entrySet()) { - changeLevel(entry.getKey(), entry.getValue()); - } - } - - public static void changeLevel(String name, String level) { - MultiAppLoggerSpaceManager.setLoggerLevel(name, OCEANBASE_TABLE_CLIENT_LOGGER_SPACE, - AdapterLevel.getAdapterLevel(level)); - } } diff --git a/src/main/resources/oceanbase-table-client/log/log4j/log-conf.xml b/src/main/resources/oceanbase-table-client/log/log4j/log-conf.xml deleted file mode 100644 index e16d2fd5..00000000 --- a/src/main/resources/oceanbase-table-client/log/log4j/log-conf.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/oceanbase-table-client/log/log4j2/log-conf.xml b/src/main/resources/oceanbase-table-client/log/log4j2/log-conf.xml deleted file mode 100644 index 0c09c0b5..00000000 --- a/src/main/resources/oceanbase-table-client/log/log4j2/log-conf.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - ${sys:logging.level.oceanbase-table-client} - ${sys:logging.path.oceanbase-table-client} - ${sys:file.encoding} - - - - - - - %d-%m%n - - - - - - - - - - - %d-%m%n - - - - - - - - - - - %d-%m%n - - - - - - - - - - - %d-%m%n - - - - - - - - - - - %d-%m%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml deleted file mode 100644 index cc211315..00000000 --- a/src/test/resources/logback-test.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n - - - - - - - diff --git a/src/main/resources/oceanbase-table-client/log/logback/log-conf.xml b/src/test/resources/logback.xml similarity index 79% rename from src/main/resources/oceanbase-table-client/log/logback/log-conf.xml rename to src/test/resources/logback.xml index ba2d8b12..6156653a 100644 --- a/src/main/resources/oceanbase-table-client/log/logback/log-conf.xml +++ b/src/test/resources/logback.xml @@ -1,8 +1,14 @@ + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n + + + - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client.log + logs/oceanbase-table-client/oceanbase-table-client.log %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] - %msg%n @@ -10,7 +16,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client.%d{yyyy-MM-dd}.%i.log + logs/oceanbase-table-client/oceanbase-table-client.%d{yyyy-MM-dd}.%i.log false 30 100MB @@ -19,7 +25,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-boot.log + logs/oceanbase-table-client/oceanbase-table-client-boot.log %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - [%C{0}#%L] - %msg%n @@ -27,7 +33,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-boot.%d{yyyy-MM-dd}.%i.log + logs/oceanbase-table-client/oceanbase-table-client-boot.%d{yyyy-MM-dd}.%i.log false 30 100MB @@ -36,7 +42,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-monitor.log + logs/oceanbase-table-client/oceanbase-table-client-monitor.log %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n @@ -44,7 +50,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-monitor.%d{yyyy-MM-dd}.%i.log + logs/oceanbase-table-client/oceanbase-table-client-monitor.%d{yyyy-MM-dd}.%i.log false 30 500MB @@ -54,7 +60,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-runtime.log + logs/oceanbase-table-client/oceanbase-table-client-runtime.log %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n @@ -62,7 +68,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-runtime.%d{yyyy-MM-dd}.%i.log + logs/oceanbase-table-client/oceanbase-table-client-runtime.%d{yyyy-MM-dd}.%i.log false 30 100MB @@ -71,7 +77,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-direct.log + logs/oceanbase-table-client/oceanbase-table-client-direct.log %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n @@ -79,7 +85,7 @@ - ${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-direct.%d{yyyy-MM-dd}.%i.log + logs/oceanbase-table-client/oceanbase-table-client-direct.%d{yyyy-MM-dd}.%i.log false 30 100MB @@ -125,28 +131,32 @@ - + - + - + - + - + + + + + \ No newline at end of file