Skip to content
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

Jump to bottom

Enhancement/logger factory #3389

Merged
merged 7 commits into from
Jan 31, 2019
Merged

Enhancement/logger factory #3389

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4e2772
polishing LoggerFactory
kezhenxu94 Jan 30, 2019
e1a540b
polishing code using map.computeIfAbsent
kezhenxu94 Jan 30, 2019
bc652eb
fix ci failure
kezhenxu94 Jan 30, 2019
550e8a6
remove unnecessary break in switch
kezhenxu94 Jan 30, 2019
5b3c821
call overloaded method
kezhenxu94 Jan 30, 2019
5188b28
update as requested
kezhenxu94 Jan 31, 2019
50ad261
add unit test
kezhenxu94 Jan 31, 2019
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
73 changes: 34 additions & 39 deletions dubbo-common/src/main/java/org/apache/dubbo/common/logger/LoggerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.apache.dubbo.common.logger.support.FailsafeLogger;

import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
Expand All @@ -34,40 +36,43 @@
*/
public class LoggerFactory {

private static final ConcurrentMap<String, FailsafeLogger> LOGGERS = new ConcurrentHashMap<String, FailsafeLogger>();
private static final ConcurrentMap<String, FailsafeLogger> LOGGERS = new ConcurrentHashMap<>();
private static volatile LoggerAdapter LOGGER_ADAPTER;

// search common-used logging frameworks
static {
String logger = System.getProperty("dubbo.application.logger");
if ("slf4j".equals(logger)) {
setLoggerAdapter(new Slf4jLoggerAdapter());
} else if ("jcl".equals(logger)) {
setLoggerAdapter(new JclLoggerAdapter());
} else if ("log4j".equals(logger)) {
setLoggerAdapter(new Log4jLoggerAdapter());
} else if ("jdk".equals(logger)) {
setLoggerAdapter(new JdkLoggerAdapter());
} else if ("log4j2".equals(logger)) {
setLoggerAdapter(new Log4j2LoggerAdapter());
} else {
try {
String logger = System.getProperty("dubbo.application.logger", "");
switch (logger) {
case "slf4j":
setLoggerAdapter(new Slf4jLoggerAdapter());
break;
case "jcl":
setLoggerAdapter(new JclLoggerAdapter());
break;
case "log4j":
setLoggerAdapter(new Log4jLoggerAdapter());
} catch (Throwable e1) {
try {
setLoggerAdapter(new Slf4jLoggerAdapter());
} catch (Throwable e2) {
break;
case "jdk":
setLoggerAdapter(new JdkLoggerAdapter());
break;
case "log4j2":
setLoggerAdapter(new Log4j2LoggerAdapter());
break;
default:
List<Class<? extends LoggerAdapter>> candidates = Arrays.asList(
Log4jLoggerAdapter.class,
Slf4jLoggerAdapter.class,
Log4j2LoggerAdapter.class,
ralf0131 marked this conversation as resolved.
Show resolved Hide resolved
JclLoggerAdapter.class,
JdkLoggerAdapter.class
);
for (Class<? extends LoggerAdapter> clazz : candidates) {
try {
setLoggerAdapter(new Log4j2LoggerAdapter());
} catch (Throwable e3) {
try {
setLoggerAdapter(new JclLoggerAdapter());
} catch (Throwable e4) {
setLoggerAdapter(new JdkLoggerAdapter());
}
setLoggerAdapter(clazz.newInstance());
break;
} catch (Throwable ignored) {
}
}
}
}
}

Expand Down Expand Up @@ -103,12 +108,7 @@ public static void setLoggerAdapter(LoggerAdapter loggerAdapter) {
* @return logger
*/
public static Logger getLogger(Class<?> key) {
FailsafeLogger logger = LOGGERS.get(key.getName());
if (logger == null) {
LOGGERS.putIfAbsent(key.getName(), new FailsafeLogger(LOGGER_ADAPTER.getLogger(key)));
logger = LOGGERS.get(key.getName());
}
return logger;
return LOGGERS.computeIfAbsent(key.getName(), name -> new FailsafeLogger(LOGGER_ADAPTER.getLogger(key)));
kezhenxu94 marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand All @@ -118,12 +118,7 @@ public static Logger getLogger(Class<?> key) {
* @return logger provider
*/
public static Logger getLogger(String key) {
FailsafeLogger logger = LOGGERS.get(key);
if (logger == null) {
LOGGERS.putIfAbsent(key, new FailsafeLogger(LOGGER_ADAPTER.getLogger(key)));
logger = LOGGERS.get(key);
}
return logger;
return LOGGERS.computeIfAbsent(key, k -> new FailsafeLogger(LOGGER_ADAPTER.getLogger(k)));
}

/**
Expand Down Expand Up @@ -153,4 +148,4 @@ public static File getFile() {
return LOGGER_ADAPTER.getFile();
}

}
}