Skip to content

Commit a13481f

Browse files
authored
Merge pull request #235 from oceanbase/remove_sofa_log
[Chore] remove the use of sofa common log
2 parents d0701b6 + 121b970 commit a13481f

File tree

6 files changed

+33
-241
lines changed

6 files changed

+33
-241
lines changed

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@
166166
</exclusion>
167167
</exclusions>
168168
</dependency>
169+
<dependency>
170+
<groupId>ch.qos.logback</groupId>
171+
<artifactId>logback-classic</artifactId>
172+
<version>1.2.12</version>
173+
<scope>test</scope>
174+
</dependency>
169175
</dependencies>
170176

171177
<build>

src/main/java/com/alipay/oceanbase/rpc/util/TableClientLoggerFactory.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
package com.alipay.oceanbase.rpc.util;
1919

2020
import com.alipay.sofa.common.code.LogCode2Description;
21-
import com.alipay.sofa.common.log.MultiAppLoggerSpaceManager;
22-
import com.alipay.sofa.common.log.adapter.level.AdapterLevel;
2321
import org.slf4j.Logger;
2422
import org.slf4j.helpers.NOPLogger;
23+
import org.slf4j.LoggerFactory;
2524

2625
import java.util.Map;
2726

@@ -52,13 +51,7 @@ public static Logger getLogger(String name) {
5251
return null;
5352
}
5453

55-
if (!MultiAppLoggerSpaceManager.isSpaceInitialized(OCEANBASE_TABLE_CLIENT_LOGGER_SPACE)) {
56-
//initLogger();
57-
MultiAppLoggerSpaceManager.init(OCEANBASE_TABLE_CLIENT_LOGGER_SPACE, null);
58-
}
59-
60-
return MultiAppLoggerSpaceManager.getLoggerBySpace(name,
61-
OCEANBASE_TABLE_CLIENT_LOGGER_SPACE);
54+
return LoggerFactory.getLogger(name);
6255
}
6356

6457
public static Logger getLogger(Class<?> klass) {
@@ -100,15 +93,4 @@ public static Logger getDIRECTLogger() {
10093

10194
return DIRECT;
10295
}
103-
104-
public static void changeLevel(Map<String, String> levelMap) {
105-
for (Map.Entry<String, String> entry : levelMap.entrySet()) {
106-
changeLevel(entry.getKey(), entry.getValue());
107-
}
108-
}
109-
110-
public static void changeLevel(String name, String level) {
111-
MultiAppLoggerSpaceManager.setLoggerLevel(name, OCEANBASE_TABLE_CLIENT_LOGGER_SPACE,
112-
AdapterLevel.getAdapterLevel(level));
113-
}
11496
}

src/main/resources/oceanbase-table-client/log/log4j/log-conf.xml

Lines changed: 0 additions & 94 deletions
This file was deleted.

src/main/resources/oceanbase-table-client/log/log4j2/log-conf.xml

Lines changed: 0 additions & 100 deletions
This file was deleted.

src/test/resources/logback-test.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)