This is an automated email from the ASF dual-hosted git repository. namelchev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push: new a077937 IGNITE-16101 Updated log4j version to 2.15 (#9643) a077937 is described below commit a07793788be63d4d68bd135fff392fcb78a7560e Author: nao <56360298+nao...@users.noreply.github.com> AuthorDate: Mon Dec 13 15:07:23 2021 +0300 IGNITE-16101 Updated log4j version to 2.15 (#9643) --- .../apache/ignite/logger/log4j2/Log4J2Logger.java | 26 +++++++--------------- parent/pom.xml | 2 +- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java b/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java index 66050c2..954c7c8 100644 --- a/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java +++ b/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java @@ -18,7 +18,6 @@ package org.apache.ignite.logger.log4j2; import java.io.File; -import java.lang.reflect.Field; import java.net.URL; import java.nio.charset.Charset; import java.util.Map; @@ -237,27 +236,18 @@ public class Log4J2Logger implements IgniteLogger, LoggerNodeIdAndApplicationAwa return ((RollingFileAppender)a).getFileName(); if (a instanceof RoutingAppender) { - try { - RoutingAppender routing = (RoutingAppender)a; + RoutingAppender routing = (RoutingAppender)a; - Field appsFiled = routing.getClass().getDeclaredField("appenders"); + Map<String, AppenderControl> appenders = routing.getAppenders(); - appsFiled.setAccessible(true); + for (AppenderControl control : appenders.values()) { + Appender innerApp = control.getAppender(); - Map<String, AppenderControl> appenders = (Map<String, AppenderControl>)appsFiled.get(routing); + if (innerApp instanceof FileAppender) + return normalize(((FileAppender)innerApp).getFileName()); - for (AppenderControl control : appenders.values()) { - Appender innerApp = control.getAppender(); - - if (innerApp instanceof FileAppender) - return normalize(((FileAppender)innerApp).getFileName()); - - if (innerApp instanceof RollingFileAppender) - return normalize(((RollingFileAppender)innerApp).getFileName()); - } - } - catch (IllegalAccessException | NoSuchFieldException e) { - error("Failed to get file name (was the implementation of log4j2 changed?).", e); + if (innerApp instanceof RollingFileAppender) + return normalize(((RollingFileAppender)innerApp).getFileName()); } } } diff --git a/parent/pom.xml b/parent/pom.xml index 4080cd5..a57e612 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -100,7 +100,7 @@ <jtidy.version>r938</jtidy.version> <kafka.version>2.0.1</kafka.version> <karaf.version>4.0.2</karaf.version> - <log4j.version>2.11.0</log4j.version> + <log4j.version>2.15.0</log4j.version> <lucene.bundle.version>7.4.0_1</lucene.bundle.version> <lucene.version>7.4.0</lucene.version> <lz4.version>1.5.0</lz4.version>