Skip to content

Commit ca1b2c8

Browse files
nao-itMmuzaf
authored andcommitted
IGNITE-16101 Updated log4j version to 2.15 (#9643)
1 parent 9697449 commit ca1b2c8

2 files changed

Lines changed: 9 additions & 19 deletions

File tree

modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.apache.ignite.logger.log4j2;
1919

2020
import java.io.File;
21-
import java.lang.reflect.Field;
2221
import java.net.URL;
2322
import java.nio.charset.Charset;
2423
import java.util.Map;
@@ -234,27 +233,18 @@ static void cleanup() {
234233
return ((RollingFileAppender)a).getFileName();
235234

236235
if (a instanceof RoutingAppender) {
237-
try {
238-
RoutingAppender routing = (RoutingAppender)a;
236+
RoutingAppender routing = (RoutingAppender)a;
239237

240-
Field appsFiled = routing.getClass().getDeclaredField("appenders");
238+
Map<String, AppenderControl> appenders = routing.getAppenders();
241239

242-
appsFiled.setAccessible(true);
240+
for (AppenderControl control : appenders.values()) {
241+
Appender innerApp = control.getAppender();
243242

244-
Map<String, AppenderControl> appenders = (Map<String, AppenderControl>)appsFiled.get(routing);
243+
if (innerApp instanceof FileAppender)
244+
return normalize(((FileAppender)innerApp).getFileName());
245245

246-
for (AppenderControl control : appenders.values()) {
247-
Appender innerApp = control.getAppender();
248-
249-
if (innerApp instanceof FileAppender)
250-
return normalize(((FileAppender)innerApp).getFileName());
251-
252-
if (innerApp instanceof RollingFileAppender)
253-
return normalize(((RollingFileAppender)innerApp).getFileName());
254-
}
255-
}
256-
catch (IllegalAccessException | NoSuchFieldException e) {
257-
error("Failed to get file name (was the implementation of log4j2 changed?).", e);
246+
if (innerApp instanceof RollingFileAppender)
247+
return normalize(((RollingFileAppender)innerApp).getFileName());
258248
}
259249
}
260250
}

parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<jtidy.version>r938</jtidy.version>
102102
<kafka.version>2.0.1</kafka.version>
103103
<karaf.version>4.0.2</karaf.version>
104-
<log4j.version>2.11.0</log4j.version>
104+
<log4j.version>2.15.0</log4j.version>
105105
<lucene.bundle.version>7.4.0_1</lucene.bundle.version>
106106
<lucene.version>7.4.0</lucene.version>
107107
<lz4.version>1.5.0</lz4.version>

0 commit comments

Comments
 (0)