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

Only log ConfigWatch errors to trace if failFast=false.

Browse Source 
fixes gh-145
This commit is contained in:
Spencer Gibb
2016-02-26 10:32:01 -07:00
parent 9ae832f643
commit 9a8ea16312
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java
View File

@@ -40,13 +40,16 @@ import lombok.extern.apachecommons.CommonsLog;
*/
@CommonsLog
public class ConfigWatch implements Closeable, ApplicationEventPublisherAware {
private final ConsulConfigProperties properties;
private final List<String> contexts;
private final ConsulClient consul;
private AtomicBoolean running = new AtomicBoolean(false);
private ApplicationEventPublisher publisher;
private HashMap<String, Long> consulIndexes = new HashMap<>();
public ConfigWatch(List<String> contexts, ConsulClient consul) {
public ConfigWatch(ConsulConfigProperties properties, List<String> contexts, ConsulClient consul) {
this.properties = properties;
this.contexts = contexts;
this.consul = consul;
}
@@ -61,7 +64,7 @@ public class ConfigWatch implements Closeable, ApplicationEventPublisherAware {
this.running.compareAndSet(false, true);
}
@Scheduled(fixedDelayString = "${spring.cloud.consul.config.watch.delay:10}")
@Scheduled(fixedDelayString = "${spring.cloud.consul.config.watch.delay:100}")
public void watchConfigKeyValues() {
if (this.running.get()) {
for (String context : this.contexts) {
@@ -89,7 +92,11 @@ public class ConfigWatch implements Closeable, ApplicationEventPublisherAware {
}
} catch (Exception e) {
log.error("Error initializing listener for context " + context, e);
if (this.properties.isFailFast()) {
log.error("Error initializing listener for context " + context, e);
} else if (log.isTraceEnabled()) {
log.trace("Failfast is true. Error initializing listener for context " + context, e);
}
}
}
}

6
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java
View File

@@ -35,9 +35,9 @@ public class ConsulConfigAutoConfiguration {
protected static class ConsulRefreshConfiguration {
@Bean
@ConditionalOnProperty(name = "spring.cloud.consul.config.watch.enabled", matchIfMissing = true)
public ConfigWatch configWatch(ConsulPropertySourceLocator locator,
ConsulClient consul) {
return new ConfigWatch(locator.getContexts(), consul);
public ConfigWatch configWatch(ConsulConfigProperties properties,
ConsulPropertySourceLocator locator, ConsulClient consul) {
return new ConfigWatch(properties, locator.getContexts(), consul);
}
}
}