Skip to content

Supports log4j 2.6+(2.11) #1215

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
merged 2 commits into from
Mar 19, 2018
Merged

Supports log4j 2.6+(2.11) #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c54ced1
Casting explicitly to the Message #1210
kazuki43zoo Mar 19, 2018
99967dd
Upgrade to log4j-core 2.11.0 #1210
kazuki43zoo Mar 19, 2018
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.5</version> <!-- 2.6+ occurred a compile error on Log4j2AbstractLoggerImpl (This compile error will resolve on other issue) -->
<version>2.11.0</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/org/apache/ibatis/logging/log4j2/Log4j2AbstractLoggerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2009-2017 the original author or authors.
* Copyright 2009-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -20,6 +20,7 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.spi.AbstractLogger;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
Expand Down Expand Up @@ -51,27 +52,27 @@ public boolean isTraceEnabled() {

@Override
public void error(String s, Throwable e) {
log.logIfEnabled(FQCN, Level.ERROR, MARKER, new SimpleMessage(s), e);
log.logIfEnabled(FQCN, Level.ERROR, MARKER, (Message) new SimpleMessage(s), e);
}

@Override
public void error(String s) {
log.logIfEnabled(FQCN, Level.ERROR, MARKER, new SimpleMessage(s), null);
log.logIfEnabled(FQCN, Level.ERROR, MARKER, (Message) new SimpleMessage(s), null);
}

@Override
public void debug(String s) {
log.logIfEnabled(FQCN, Level.DEBUG, MARKER, new SimpleMessage(s), null);
log.logIfEnabled(FQCN, Level.DEBUG, MARKER, (Message) new SimpleMessage(s), null);
}

@Override
public void trace(String s) {
log.logIfEnabled(FQCN, Level.TRACE, MARKER, new SimpleMessage(s), null);
log.logIfEnabled(FQCN, Level.TRACE, MARKER, (Message) new SimpleMessage(s), null);
}

@Override
public void warn(String s) {
log.logIfEnabled(FQCN, Level.WARN, MARKER, new SimpleMessage(s), null);
log.logIfEnabled(FQCN, Level.WARN, MARKER, (Message) new SimpleMessage(s), null);
}

}