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

reduce logging on ConfigWatch connection failure

Browse Source 
fixes gh-181
This commit is contained in:
Bill Gray
2016-05-09 15:21:29 -06:00
committed by Spencer Gibb
parent cf998fffae
commit 8206c2c923
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import lombok.Data; import lombok.Data;
import lombok.extern.apachecommons.CommonsLog; import lombok.extern.apachecommons.CommonsLog;
import org.springframework.util.ReflectionUtils;
/** /**
* @author Spencer Gibb * @author Spencer Gibb
@@ -47,6 +48,7 @@ public class ConfigWatch implements Closeable, ApplicationEventPublisherAware {
private AtomicBoolean running = new AtomicBoolean(false); private AtomicBoolean running = new AtomicBoolean(false);
private ApplicationEventPublisher publisher; private ApplicationEventPublisher publisher;
private HashMap<String, Long> consulIndexes = new HashMap<>(); private HashMap<String, Long> consulIndexes = new HashMap<>();
private Boolean initialized = false;
public ConfigWatch(ConsulConfigProperties properties, List<String> contexts, ConsulClient consul) { public ConfigWatch(ConsulConfigProperties properties, List<String> contexts, ConsulClient consul) {
this.properties = properties; this.properties = properties;
@@ -64,7 +66,7 @@ public class ConfigWatch implements Closeable, ApplicationEventPublisherAware {
this.running.compareAndSet(false, true); this.running.compareAndSet(false, true);
} }
@Scheduled(fixedDelayString = "${spring.cloud.consul.config.watch.delay:100}") @Scheduled(fixedDelayString = "${spring.cloud.consul.config.watch.delay:1000}")
public void watchConfigKeyValues() { public void watchConfigKeyValues() {
if (this.running.get()) { if (this.running.get()) {
for (String context : this.contexts) { for (String context : this.contexts) {
@@ -92,14 +94,20 @@ public class ConfigWatch implements Closeable, ApplicationEventPublisherAware {
} }
} catch (Exception e) { } catch (Exception e) {
if (this.properties.isFailFast()) { // only fail fast on the initial query, otherwise just log the error
log.error("Error initializing listener for context " + context, e); if (!initialized && this.properties.isFailFast()) {
log.error("Fail fast is set and there was an error reading configuration from consul.");
ReflectionUtils.rethrowRuntimeException(e);
} else if (log.isTraceEnabled()) { } else if (log.isTraceEnabled()) {
log.trace("Failfast is true. Error initializing listener for context " + context, e); log.trace("Error querying consul Key/Values for context '" + context + "'", e);
} else if (log.isWarnEnabled()) {
// simplified one line log message in the event of an agent failure
log.warn("Error querying consul Key/Values for context '" + context + "'. Message: " + e.getMessage());
} }
} }
} }
} }
initialized = true;
} }
@Override @Override

1
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocator.java
View File

@@ -117,6 +117,7 @@ public class ConsulPropertySourceLocator implements PropertySourceLocator {
} }
} catch (Exception e) { } catch (Exception e) {
if (this.properties.isFailFast()) { if (this.properties.isFailFast()) {
log.error("Fail fast is set and there was an error reading configuration from consul.");
ReflectionUtils.rethrowRuntimeException(e); ReflectionUtils.rethrowRuntimeException(e);
} else { } else {
log.warn("Unable to load consul config from "+ propertySourceContext, e); log.warn("Unable to load consul config from "+ propertySourceContext, e);