Skip to content

fix log level is null in Slf4j and fix not valid in Log4j2 #12671

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
AlbumenJ merged 6 commits into from
Jul 25, 2023
Merged

fix log level is null in Slf4j and fix not valid in Log4j2 #12671

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a4f00c
fix log level is null in Slf4j and fix not valid in Log4j2
xixingya Jul 5, 2023
ffe3d44
format logger code
xixingya Jul 14, 2023
b2817b4
format logger code
xixingya Jul 14, 2023
caf381d
format logger code
xixingya Jul 14, 2023
4cf6871
format logger code
xixingya Jul 17, 2023
2a5f5c4
fix npe
xixingya Jul 25, 2023
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
8 changes: 8 additions & 0 deletions dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j2/Log4j2LoggerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.dubbo.common.logger.LoggerAdapter;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.config.Configurator;

import java.io.File;

Expand All @@ -30,6 +31,12 @@ public class Log4j2LoggerAdapter implements LoggerAdapter {
private Level level;

public Log4j2LoggerAdapter() {
try {
org.apache.logging.log4j.Logger logger = LogManager.getRootLogger();
this.level = fromLog4j2Level(logger.getLevel());
} catch (Exception t) {
// ignore
}
}

private static org.apache.logging.log4j.Level toLog4j2Level(Level level) {
Expand Down Expand Up @@ -94,6 +101,7 @@ public Level getLevel() {
@Override
public void setLevel(Level level) {
this.level = level;
Configurator.setLevel(LogManager.getRootLogger(), toLog4j2Level(level));
}

@Override
Expand Down
24 changes: 24 additions & 0 deletions dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.dubbo.common.logger.slf4j;

import org.apache.dubbo.common.logger.Level;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.support.FailsafeLogger;

Expand Down Expand Up @@ -198,4 +199,27 @@ public boolean isErrorEnabled() {
return logger.isErrorEnabled();
}

public static Level getLevel(org.slf4j.Logger logger) {
if (logger.isTraceEnabled()) {
return Level.TRACE;
}
if (logger.isDebugEnabled()) {
return Level.DEBUG;
}
if (logger.isInfoEnabled()) {
return Level.INFO;
}
if (logger.isWarnEnabled()) {
return Level.WARN;
}
if (logger.isErrorEnabled()) {
return Level.ERROR;
}
return Level.OFF;
}

public Level getLevel() {
return getLevel(logger);
}

}
11 changes: 11 additions & 0 deletions dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,28 @@
*/
package org.apache.dubbo.common.logger.slf4j;

import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.Level;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerAdapter;
import org.apache.dubbo.common.utils.ClassUtils;
import org.slf4j.LoggerFactory;

import java.io.File;

public class Slf4jLoggerAdapter implements LoggerAdapter {
public static final String NAME = "slf4j";

private static final ErrorTypeAwareLogger logger = org.apache.dubbo.common.logger.LoggerFactory.getErrorTypeAwareLogger(Slf4jLoggerAdapter.class);
private Level level;
private File file;

private static final org.slf4j.Logger ROOT_LOGGER = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);

public Slf4jLoggerAdapter() {
this.level = Slf4jLogger.getLevel(ROOT_LOGGER);
}

@Override
public Logger getLogger(String key) {
return new Slf4jLogger(org.slf4j.LoggerFactory.getLogger(key));
Expand All @@ -45,6 +55,7 @@ public Level getLevel() {

@Override
public void setLevel(Level level) {
logger.warn("", "", "", String.format("The level of slf4j logger current can not be set, using the default level: %s", Slf4jLogger.getLevel(ROOT_LOGGER)));
this.level = level;
}

Expand Down