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

Alternate approach to remove Log4J 1.x dependency ( see #11264 ) #11265

Closed
wants to merge 4 commits into from
Closed

Alternate approach to remove Log4J 1.x dependency ( see #11264 ) #11265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c04e3d
Redirect Log4J 1.x to Log 2.x
Stwissel May 17, 2021
bc1336e
Revert "Redirect Log4J 1.x to Log 2.x"
Stwissel May 17, 2021
0d22e60
Replace Log4J 1.x with Log4J 2.x
Stwissel May 17, 2021
6ec5478
Fixed http to https ur
Stwissel May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions common/pom.xml
View file
Open in desktop
Expand Up @@ -63,11 +63,6 @@
<artifactId>commons-logging</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
Expand Down
76 changes: 38 additions & 38 deletions common/src/main/java/io/netty/util/internal/logging/Log4JLogger.java
View file
Open in desktop
Expand Up @@ -39,11 +39,11 @@
*/
package io.netty.util.internal.logging;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;

/**
* <a href="https://logging.apache.org/log4j/1.2/index.html">Apache Log4J</a>
* <a href="https://logging.apache.org/log4j/2.x/index.html">Apache Log4J</a>
* logger.
*/
class Log4JLogger extends AbstractInternalLogger {
Expand Down Expand Up @@ -86,9 +86,9 @@ private boolean isTraceCapable() {
public boolean isTraceEnabled() {
if (traceCapable) {
return logger.isTraceEnabled();
} else {
return logger.isDebugEnabled();
}

return logger.isDebugEnabled();
}

/**
Expand All @@ -99,7 +99,7 @@ public boolean isTraceEnabled() {
*/
@Override
public void trace(String msg) {
logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, msg, null);
logger.log(traceCapable ? Level.TRACE : Level.DEBUG, msg);
}

/**
Expand All @@ -120,7 +120,7 @@ public void trace(String msg) {
public void trace(String format, Object arg) {
if (isTraceEnabled()) {
FormattingTuple ft = MessageFormatter.format(format, arg);
logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft
logger.log(traceCapable ? Level.TRACE : Level.DEBUG, ft
.getMessage(), ft.getThrowable());
}
}
Expand All @@ -145,7 +145,7 @@ public void trace(String format, Object arg) {
public void trace(String format, Object argA, Object argB) {
if (isTraceEnabled()) {
FormattingTuple ft = MessageFormatter.format(format, argA, argB);
logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft
logger.log(traceCapable ? Level.TRACE : Level.DEBUG, ft
.getMessage(), ft.getThrowable());
}
}
Expand All @@ -168,7 +168,7 @@ public void trace(String format, Object argA, Object argB) {
public void trace(String format, Object... arguments) {
if (isTraceEnabled()) {
FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft
logger.log(traceCapable ? Level.TRACE : Level.DEBUG, ft
.getMessage(), ft.getThrowable());
}
}
Expand All @@ -183,7 +183,7 @@ public void trace(String format, Object... arguments) {
*/
@Override
public void trace(String msg, Throwable t) {
logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, msg, t);
logger.log(traceCapable ? Level.TRACE : Level.DEBUG, msg, t);
}

/**
Expand All @@ -204,7 +204,7 @@ public boolean isDebugEnabled() {
*/
@Override
public void debug(String msg) {
logger.log(FQCN, Level.DEBUG, msg, null);
logger.log(Level.DEBUG, msg);
}

/**
Expand All @@ -225,7 +225,7 @@ public void debug(String msg) {
public void debug(String format, Object arg) {
if (logger.isDebugEnabled()) {
FormattingTuple ft = MessageFormatter.format(format, arg);
logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
logger.log(Level.DEBUG, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -249,7 +249,7 @@ public void debug(String format, Object arg) {
public void debug(String format, Object argA, Object argB) {
if (logger.isDebugEnabled()) {
FormattingTuple ft = MessageFormatter.format(format, argA, argB);
logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
logger.log(Level.DEBUG, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -270,7 +270,7 @@ public void debug(String format, Object argA, Object argB) {
public void debug(String format, Object... arguments) {
if (logger.isDebugEnabled()) {
FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
logger.log(Level.DEBUG, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -284,7 +284,7 @@ public void debug(String format, Object... arguments) {
*/
@Override
public void debug(String msg, Throwable t) {
logger.log(FQCN, Level.DEBUG, msg, t);
logger.log(Level.DEBUG, msg, t);
}

/**
Expand All @@ -305,7 +305,7 @@ public boolean isInfoEnabled() {
*/
@Override
public void info(String msg) {
logger.log(FQCN, Level.INFO, msg, null);
logger.log(Level.INFO, msg);
}

/**
Expand All @@ -325,7 +325,7 @@ public void info(String msg) {
public void info(String format, Object arg) {
if (logger.isInfoEnabled()) {
FormattingTuple ft = MessageFormatter.format(format, arg);
logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
logger.log(Level.INFO, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -349,7 +349,7 @@ public void info(String format, Object arg) {
public void info(String format, Object argA, Object argB) {
if (logger.isInfoEnabled()) {
FormattingTuple ft = MessageFormatter.format(format, argA, argB);
logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
logger.log(Level.INFO, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -371,7 +371,7 @@ public void info(String format, Object argA, Object argB) {
public void info(String format, Object... argArray) {
if (logger.isInfoEnabled()) {
FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
logger.log(Level.INFO, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -386,7 +386,7 @@ public void info(String format, Object... argArray) {
*/
@Override
public void info(String msg, Throwable t) {
logger.log(FQCN, Level.INFO, msg, t);
logger.log(Level.INFO, msg, t);
}

/**
Expand All @@ -396,7 +396,7 @@ public void info(String msg, Throwable t) {
*/
@Override
public boolean isWarnEnabled() {
return logger.isEnabledFor(Level.WARN);
return logger.isEnabled(Level.WARN);
}

/**
Expand All @@ -407,7 +407,7 @@ public boolean isWarnEnabled() {
*/
@Override
public void warn(String msg) {
logger.log(FQCN, Level.WARN, msg, null);
logger.log(Level.WARN, msg);
}

/**
Expand All @@ -426,9 +426,9 @@ public void warn(String msg) {
*/
@Override
public void warn(String format, Object arg) {
if (logger.isEnabledFor(Level.WARN)) {
if (logger.isEnabled(Level.WARN)) {
FormattingTuple ft = MessageFormatter.format(format, arg);
logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
logger.log(Level.WARN, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -450,9 +450,9 @@ public void warn(String format, Object arg) {
*/
@Override
public void warn(String format, Object argA, Object argB) {
if (logger.isEnabledFor(Level.WARN)) {
if (logger.isEnabled(Level.WARN)) {
FormattingTuple ft = MessageFormatter.format(format, argA, argB);
logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
logger.log(Level.WARN, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -472,9 +472,9 @@ public void warn(String format, Object argA, Object argB) {
*/
@Override
public void warn(String format, Object... argArray) {
if (logger.isEnabledFor(Level.WARN)) {
if (logger.isEnabled(Level.WARN)) {
FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
logger.log(Level.WARN, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -489,7 +489,7 @@ public void warn(String format, Object... argArray) {
*/
@Override
public void warn(String msg, Throwable t) {
logger.log(FQCN, Level.WARN, msg, t);
logger.log(Level.WARN, msg, t);
}

/**
Expand All @@ -499,7 +499,7 @@ public void warn(String msg, Throwable t) {
*/
@Override
public boolean isErrorEnabled() {
return logger.isEnabledFor(Level.ERROR);
return logger.isEnabled(Level.ERROR);
}

/**
Expand All @@ -510,7 +510,7 @@ public boolean isErrorEnabled() {
*/
@Override
public void error(String msg) {
logger.log(FQCN, Level.ERROR, msg, null);
logger.log(Level.ERROR, msg);
}

/**
Expand All @@ -529,9 +529,9 @@ public void error(String msg) {
*/
@Override
public void error(String format, Object arg) {
if (logger.isEnabledFor(Level.ERROR)) {
if (logger.isEnabled(Level.ERROR)) {
FormattingTuple ft = MessageFormatter.format(format, arg);
logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
logger.log(Level.ERROR, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -553,9 +553,9 @@ public void error(String format, Object arg) {
*/
@Override
public void error(String format, Object argA, Object argB) {
if (logger.isEnabledFor(Level.ERROR)) {
if (logger.isEnabled(Level.ERROR)) {
FormattingTuple ft = MessageFormatter.format(format, argA, argB);
logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
logger.log(Level.ERROR, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -575,9 +575,9 @@ public void error(String format, Object argA, Object argB) {
*/
@Override
public void error(String format, Object... argArray) {
if (logger.isEnabledFor(Level.ERROR)) {
if (logger.isEnabled(Level.ERROR)) {
FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
logger.log(Level.ERROR, ft.getMessage(), ft.getThrowable());
}
}

Expand All @@ -592,6 +592,6 @@ public void error(String format, Object... argArray) {
*/
@Override
public void error(String msg, Throwable t) {
logger.log(FQCN, Level.ERROR, msg, t);
logger.log(Level.ERROR, msg, t);
}
}
5 changes: 3 additions & 2 deletions common/src/main/java/io/netty/util/internal/logging/Log4JLoggerFactory.java
View file
Open in desktop
Expand Up @@ -15,7 +15,8 @@
*/
package io.netty.util.internal.logging;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

/**
* Logger factory which creates an
Expand All @@ -35,6 +36,6 @@ public Log4JLoggerFactory() {

@Override
public InternalLogger newInstance(String name) {
return new Log4JLogger(Logger.getLogger(name));
return new Log4JLogger(LogManager.getLogger(name));
}
}