You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2021/12/24 13:56:43 UTC
[logging-log4j2] branch master updated: LOG4J2-3204 Correct SpringLookup package name in Interpolator. (#617)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 65c367d LOG4J2-3204 Correct SpringLookup package name in Interpolator. (#617)
65c367d is described below
commit 65c367dc3d45ac6b8185127b28bdc04c2f335a3c
Author: Francis <95...@qq.com>
AuthorDate: Fri Dec 24 21:51:04 2021 +0800
LOG4J2-3204 Correct SpringLookup package name in Interpolator. (#617)
---
.../logging/log4j/core/lookup/Interpolator.java | 2 +-
.../logging/log4j/spring/boot/SpringLookupTest.java | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
index c1edaee..0713017 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
@@ -148,7 +148,7 @@ public class Interpolator extends AbstractConfigurationAwareLookup {
}
try {
strLookupMap.put(LOOKUP_KEY_SPRING,
- Loader.newCheckedInstanceOf("org.apache.logging.log4j.spring.cloud.config.client.SpringLookup", StrLookup.class));
+ Loader.newCheckedInstanceOf("org.apache.logging.log4j.spring.boot.SpringLookup", StrLookup.class));
} catch (final Exception ignored) {
handleError(LOOKUP_KEY_SPRING, ignored);
}
diff --git a/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/SpringLookupTest.java b/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/SpringLookupTest.java
index f934943..eb264f8 100644
--- a/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/SpringLookupTest.java
+++ b/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/SpringLookupTest.java
@@ -18,6 +18,8 @@ package org.apache.logging.log4j.spring.boot;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.lookup.Interpolator;
+import org.apache.logging.log4j.core.lookup.StrLookup;
import org.junit.Test;
import org.springframework.mock.env.MockEnvironment;
@@ -57,4 +59,22 @@ public class SpringLookupTest {
assertNotNull("Did not find property", result);
assertEquals("Incorrect property value", "test", result);
}
+
+ @Test
+ public void testSpringLookupWithDefaultInterpolator() {
+ MockEnvironment env = new MockEnvironment();
+ env.setActiveProfiles("test");
+ env.setProperty("app.property", "test");
+ LoggerContext context = (LoggerContext) LogManager.getContext(false);
+ context.putObject(Log4j2CloudConfigLoggingSystem.ENVIRONMENT_KEY, env);
+
+ StrLookup lookup = new Interpolator();
+ String result = lookup.lookup("spring:profiles.active");
+ assertNotNull("No active profiles", result);
+ assertEquals("Incorrect active profile", "test", result);
+
+ result = lookup.lookup("spring:app.property");
+ assertNotNull("Did not find property", result);
+ assertEquals("Incorrect property value", "test", result);
+ }
}