[logging-log4j2] branch master updated: LOG4J2-3147 Fix Spring package check in KubernetesLookup. (#569)

[vy]

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 1a24f7a  LOG4J2-3147 Fix Spring package check in KubernetesLookup. 
(#569)
1a24f7a is described below

commit 1a24f7a89452042d997489d71ea5b37398ef1a2d
Author: Matthew McMahon <macca...@gmail.com>
AuthorDate: Thu Aug 26 17:25:26 2021 +1000

    LOG4J2-3147 Fix Spring package check in KubernetesLookup. (#569)
    
    Co-authored-by: Matthew McMahon <matthew.mcma...@thetradedesk.com>
---
 .../java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
 
b/log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
index 337592e..f0fce4e 100644
--- 
a/log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
+++ 
b/log4j-kubernetes/src/main/java/org/apache/logging/log4j/kubernetes/KubernetesLookup.java
@@ -57,7 +57,8 @@ public class KubernetesLookup extends AbstractLookup {
     private static volatile KubernetesInfo kubernetesInfo;
     private static final Lock initLock = new ReentrantLock();
     private static final boolean isSpringIncluded =
-            
LoaderUtil.isClassAvailable("org.apache.logging.log4j.spring.cloud.config.client.SpringEnvironmentHolder");
+            
LoaderUtil.isClassAvailable("org.apache.logging.log4j.spring.cloud.config.client.SpringEnvironmentHolder")
+                    || 
LoaderUtil.isClassAvailable("org.apache.logging.log4j.spring.boot.SpringEnvironmentHolder");
     private Pod pod;
     private Namespace namespace;
     private URL masterUrl;