Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14289. Move log4j APIs over to slf4j in hadoop-common.

This commit is contained in:
Akira Ajisaka 2017-06-16 13:17:10 +09:00
parent fb68980959
commit e855cc4ed4
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpRequestLog.java
View File

@ -24,16 +24,18 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogConfigurationException;
import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Appender;
import org.apache.log4j.Logger;
import org.eclipse.jetty.server.NCSARequestLog;
import org.eclipse.jetty.server.RequestLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* RequestLog object for use with Http
*/
public class HttpRequestLog {
public static final Log LOG = LogFactory.getLog(HttpRequestLog.class);
public static final Logger LOG =
LoggerFactory.getLogger(HttpRequestLog.class);
private static final HashMap<String, String> serverToComponent;
static {
@ -65,20 +67,18 @@ public class HttpRequestLog {
}
if (isLog4JLogger) {
Log4JLogger httpLog4JLog = (Log4JLogger)logger;
Logger httpLogger = httpLog4JLog.getLogger();
org.apache.log4j.Logger httpLogger = httpLog4JLog.getLogger();
Appender appender = null;
try {
appender = httpLogger.getAppender(appenderName);
} catch (LogConfigurationException e) {
LOG.warn("Http request log for " + loggerName
+ " could not be created");
LOG.warn("Http request log for {} could not be created", loggerName);
throw e;
}
if (appender == null) {
LOG.info("Http request log for " + loggerName
+ " is not defined");
LOG.info("Http request log for {} is not defined", loggerName);
return null;
}
@ -89,14 +89,11 @@ public class HttpRequestLog {
requestLog.setFilename(requestLogAppender.getFilename());
requestLog.setRetainDays(requestLogAppender.getRetainDays());
return requestLog;
}
else {
LOG.warn("Jetty request log for " + loggerName
+ " was of the wrong class");
} else {
LOG.warn("Jetty request log for {} was of the wrong class", loggerName);
return null;
}
}
else {
} else {
LOG.warn("Jetty request log can only be enabled using Log4j");
return null;
}