You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/09/23 20:02:07 UTC

(logging-log4j2) branch 2.24.x updated (421d8a797f -> 211c7091e8)

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a change to branch 2.24.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


    from 421d8a797f Revert "Fix reloading of the configuration from HTTP(S)"
     add 211c7091e8 Fix reloading of the configuration from HTTP(S)

No new revisions were added by this update.

Summary of changes:
 log4j-appserver/pom.xml                            |  10 +
 .../log4j/core/config/ConfigurationSourceTest.java |  62 ++---
 .../filter/HttpThreadContextMapFilterTest.java     | 202 -----------------
 .../filter/MutableThreadContextMapFilterTest.java  | 250 ++++++++++++++++-----
 .../log4j/core/net/UrlConnectionFactoryTest.java   | 213 ++++++++----------
 .../logging/log4j/core/net/WireMockUtil.java       |  84 +++++++
 .../logging/log4j/core/util/HttpWatcherTest.java   | 160 +++++++++++++
 .../logging/log4j/core/util/WatchHttpTest.java     | 156 -------------
 .../logging/log4j/core/util/WatchManagerTest.java  | 177 ++++++++-------
 .../resources/config/ConfigurationSourceTest.xml   |  12 +-
 .../src/test/resources/emptyConfig.json            |   4 -
 .../filter/MutableThreadContextMapFilterTest.xml   |  13 +-
 .../src/test/resources/filterConfig.json           |   6 -
 .../src/test/resources/log4j2-mutableFilter.xml    |  35 ---
 .../apache/logging/log4j/core/LoggerContext.java   |  19 +-
 .../log4j/core/config/AbstractConfiguration.java   |  30 ++-
 .../log4j/core/config/ConfigurationSource.java     | 172 +++++++-------
 .../logging/log4j/core/config/HttpWatcher.java     |  39 +++-
 .../logging/log4j/core/config/package-info.java    |   2 +-
 .../log4j/core/config/xml/XmlConfiguration.java    |  12 +-
 .../core/filter/MutableThreadContextMapFilter.java |  57 +++--
 .../org/apache/logging/log4j/core/util/Loader.java |   5 +-
 .../org/apache/logging/log4j/core/util/Source.java |  45 ++--
 .../logging/log4j/core/util/WatchManager.java      |  23 +-
 .../core/util/internal/HttpInputStreamUtil.java    |  96 ++++++--
 .../logging/log4j/core/util/package-info.java      |   2 +-
 log4j-parent/pom.xml                               |  16 --
 pom.xml                                            |  19 +-
 .../2937-http-watcher.xml}                         |   4 +-
 29 files changed, 996 insertions(+), 929 deletions(-)
 delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/HttpThreadContextMapFilterTest.java
 create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/WireMockUtil.java
 create mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/HttpWatcherTest.java
 delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/WatchHttpTest.java
 copy src/site/antora/modules/ROOT/examples/manual/appenders/servlet-appender.xml => log4j-core-test/src/test/resources/config/ConfigurationSourceTest.xml (83%)
 delete mode 100644 log4j-core-test/src/test/resources/emptyConfig.json
 copy log4j-mongodb/src/test/resources/MongoDbMapMessageIT.xml => log4j-core-test/src/test/resources/filter/MutableThreadContextMapFilterTest.xml (79%)
 delete mode 100644 log4j-core-test/src/test/resources/filterConfig.json
 delete mode 100644 log4j-core-test/src/test/resources/log4j2-mutableFilter.xml
 copy src/changelog/{2.0-beta1/LOG4J2-81_PatternLayout_was_not_honoring_format_modifiers.xml => .2.x.x/2937-http-watcher.xml} (61%)