SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2021-04-07 16:12:35 -04:00
parent 6e6575c9b6 79bcd2eaa5
commit 3352b87d27
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigurationChangeDetector.java
View File

@@ -81,10 +81,17 @@ public abstract class ConfigurationChangeDetector {
}
public boolean changed(List<? extends MapPropertySource> left, List<? extends MapPropertySource> right) {
if (left.size() != right.size()) {
this.log.warn("The current number of ConfigMap PropertySources does not match "
+ "the ones loaded from the Kubernetes - No reload will take place");
if (log.isDebugEnabled()) {
this.log.debug(String.format("source 1: %d", left.size()));
left.forEach(item -> log.debug(item));
this.log.debug(String.format("source 2: %d", right.size()));
right.forEach(item -> log.debug(item));
}
return false;
}
@@ -123,6 +130,10 @@ public abstract class ConfigurationChangeDetector {
List<S> managedSources = new LinkedList<>();
LinkedList<PropertySource<?>> sources = toLinkedList(this.environment.getPropertySources());
this.log.debug("findPropertySources");
this.log.debug(String.format("environment: %s", this.environment));
this.log.debug(String.format("environment sources: %s", sources));
while (!sources.isEmpty()) {
PropertySource<?> source = sources.pop();
if (source instanceof CompositePropertySource) {
@@ -176,6 +187,10 @@ public abstract class ConfigurationChangeDetector {
this.log.debug("Found property source that cannot be handled: " + propertySource.getClass());
}
this.log.debug("locateMapPropertySources");
this.log.debug(String.format("environment: %s", environment));
this.log.debug(String.format("sources: %s", result));
return result;
}