Skip to content

[Chore] remove the use of sofa common log #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shenyunlong merged 1 commit into from
Nov 20, 2024
Merged

[Chore] remove the use of sofa common log #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions src/main/java/com/alipay/oceanbase/rpc/util/TableClientLoggerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -100,15 +93,4 @@ public static Logger getDIRECTLogger() {

return DIRECT;
}

public static void changeLevel(Map<String, String> levelMap) {
for (Map.Entry<String, String> 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));
}
}
94 changes: 0 additions & 94 deletions src/main/resources/oceanbase-table-client/log/log4j/log-conf.xml
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions src/main/resources/oceanbase-table-client/log/log4j2/log-conf.xml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/test/resources/logback-test.xml
View file
Open in desktop

This file was deleted.

40 changes: 25 additions & 15 deletions ...ase-table-client/log/logback/log-conf.xml → src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n</pattern>
</encoder>
</appender>

<appender name="OCEANBASE-TABLE-CLIENT-APPENDER"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client.log</file>
<file>logs/oceanbase-table-client/oceanbase-table-client.log</file>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] - %msg%n
</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- rollover daily -->
<fileNamePattern>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
<fileNamePattern>logs/oceanbase-table-client/oceanbase-table-client.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
<cleanHistoryOnStart>false</cleanHistoryOnStart>
<maxHistory>30</maxHistory>
<maxFileSize>100MB</maxFileSize>
Expand All @@ -19,15 +25,15 @@

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

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

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

<appender name="OCEANBASE-TABLE-CLIENT-DIRECT-APPENDER"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-direct.log</file>
<file>logs/oceanbase-table-client/oceanbase-table-client-direct.log</file>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n</pattern>
</Pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- rollover daily -->
<fileNamePattern>${logging.path:-.}/oceanbase-table-client/oceanbase-table-client-direct.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
<fileNamePattern>logs/oceanbase-table-client/oceanbase-table-client-direct.%d{yyyy-MM-dd}.%i.log </fileNamePattern>
<cleanHistoryOnStart>false</cleanHistoryOnStart>
<maxHistory>30</maxHistory>
<maxFileSize>100MB</maxFileSize>
Expand Down Expand Up @@ -125,28 +131,32 @@


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

<logger name="OBKV-BOOT" additivity="false">
<level value="${logging.level:-INFO}"/>
<level value="INFO"/>
<appender-ref ref="OCEANBASE-TABLE-CLIENT-BOOT-APPENDER"/>
</logger>

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

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

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

<root level="INFO">
<appender-ref ref="STDOUT"/>
</root>

</configuration>