Skip to content

Commit 8756a3f

Browse files
shenyunlongshenyunlong
authored
[Chore] remove the use of sofa common log (#238)
1 parent d6978b1 commit 8756a3f

File tree

5 files changed

+27
-241
lines changed

5 files changed

+27
-241
lines changed

‎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.

src/main/resources/oceanbase-table-client/log/logback/log-conf.xml renamed to src/test/resources/logback.xml

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n</pattern>
6+
</encoder>
7+
</appender>
8+
39
<appender name="OCEANBASE-TABLE-CLIENT-APPENDER"
410
class="ch.qos.logback.core.rolling.RollingFileAppender">
5-
<file>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client.log</file>
11+
<file>logs/oceanbase-table-client/oceanbase-table-client.log</file>
612
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
713
<pattern>
814
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] - %msg%n
915
</pattern>
1016
</encoder>
1117
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
1218
<!-- rollover daily -->
13-
<fileNamePattern>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
19+
<fileNamePattern>logs/oceanbase-table-client/oceanbase-table-client.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
1420
<cleanHistoryOnStart>false</cleanHistoryOnStart>
1521
<maxHistory>30</maxHistory>
1622
<maxFileSize>100MB</maxFileSize>
@@ -19,15 +25,15 @@
1925

2026
<appender name="OCEANBASE-TABLE-CLIENT-BOOT-APPENDER"
2127
class="ch.qos.logback.core.rolling.RollingFileAppender">
22-
<file>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-boot.log</file>
28+
<file>logs/oceanbase-table-client/oceanbase-table-client-boot.log</file>
2329
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
2430
<Pattern>
2531
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - [%C{0}#%L] - %msg%n</pattern>
2632
</Pattern>
2733
</encoder>
2834
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
2935
<!-- rollover daily -->
30-
<fileNamePattern>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-boot.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
36+
<fileNamePattern>logs/oceanbase-table-client/oceanbase-table-client-boot.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
3137
<cleanHistoryOnStart>false</cleanHistoryOnStart>
3238
<maxHistory>30</maxHistory>
3339
<maxFileSize>100MB</maxFileSize>
@@ -36,15 +42,15 @@
3642

3743
<appender name="OCEANBASE-TABLE-CLIENT-MONITOR-APPENDER"
3844
class="ch.qos.logback.core.rolling.RollingFileAppender">
39-
<file>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-monitor.log</file>
45+
<file>logs/oceanbase-table-client/oceanbase-table-client-monitor.log</file>
4046
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
4147
<Pattern>
4248
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n</pattern>
4349
</Pattern>
4450
</encoder>
4551
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
4652
<!-- rollover daily -->
47-
<fileNamePattern>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-monitor.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
53+
<fileNamePattern>logs/oceanbase-table-client/oceanbase-table-client-monitor.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
4854
<cleanHistoryOnStart>false</cleanHistoryOnStart>
4955
<maxHistory>30</maxHistory>
5056
<maxFileSize>500MB</maxFileSize>
@@ -54,15 +60,15 @@
5460

5561
<appender name="OCEANBASE-TABLE-CLIENT-RUNTIME-APPENDER"
5662
class="ch.qos.logback.core.rolling.RollingFileAppender">
57-
<file>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-runtime.log</file>
63+
<file>logs/oceanbase-table-client/oceanbase-table-client-runtime.log</file>
5864
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
5965
<Pattern>
6066
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n</pattern>
6167
</Pattern>
6268
</encoder>
6369
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
6470
<!-- rollover daily -->
65-
<fileNamePattern>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-runtime.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
71+
<fileNamePattern>logs/oceanbase-table-client/oceanbase-table-client-runtime.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
6672
<cleanHistoryOnStart>false</cleanHistoryOnStart>
6773
<maxHistory>30</maxHistory>
6874
<maxFileSize>100MB</maxFileSize>
@@ -71,15 +77,15 @@
7177

7278
<appender name="OCEANBASE-TABLE-CLIENT-DIRECT-APPENDER"
7379
class="ch.qos.logback.core.rolling.RollingFileAppender">
74-
<file>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-direct.log</file>
80+
<file>logs/oceanbase-table-client/oceanbase-table-client-direct.log</file>
7581
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
7682
<Pattern>
7783
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n</pattern>
7884
</Pattern>
7985
</encoder>
8086
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
8187
<!-- rollover daily -->
82-
<fileNamePattern>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-direct.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
88+
<fileNamePattern>logs/oceanbase-table-client/oceanbase-table-client-direct.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
8389
<cleanHistoryOnStart>false</cleanHistoryOnStart>
8490
<maxHistory>30</maxHistory>
8591
<maxFileSize>100MB</maxFileSize>
@@ -125,28 +131,32 @@
125131

126132

127133
<logger name="com.alipay.oceanbase.rpc" additivity="false">
128-
<level value="${logging.level:-INFO}"/>
134+
<level value="INFO"/>
129135
<appender-ref ref="OCEANBASE-TABLE-CLIENT-APPENDER-ASYNC"/>
130136
</logger>
131137

132138
<logger name="OBKV-BOOT" additivity="false">
133-
<level value="${logging.level:-INFO}"/>
139+
<level value="INFO"/>
134140
<appender-ref ref="OCEANBASE-TABLE-CLIENT-BOOT-APPENDER"/>
135141
</logger>
136142

137143
<logger name="OBKV-MONITOR" additivity="false">
138-
<level value="${logging.level:-INFO}"/>
144+
<level value="INFO"/>
139145
<appender-ref ref="OCEANBASE-TABLE-CLIENT-MONITOR-APPENDER-ASYNC"/>
140146
</logger>
141147

142148
<logger name="OBKV-RUNTIME" additivity="false">
143-
<level value="${logging.level:-INFO}"/>
149+
<level value="INFO"/>
144150
<appender-ref ref="OCEANBASE-TABLE-CLIENT-RUNTIME-APPENDER-ASYNC"/>
145151
</logger>
146152

147153
<logger name="OBKV-DIRECT" additivity="false">
148-
<level value="${logging.level:-INFO}"/>
154+
<level value="INFO"/>
149155
<appender-ref ref="OCEANBASE-TABLE-CLIENT-DIRECT-APPENDER-ASYNC"/>
150156
</logger>
151157

158+
<root level="INFO">
159+
<appender-ref ref="STDOUT"/>
160+
</root>
161+
152162
</configuration>

0 commit comments

Comments
 (0)