Merge branch 'master' into 2.0.x

This commit is contained in:
Spencer Gibb
2017-10-19 12:08:41 -04:00

View File

@@ -74,6 +74,8 @@ The default service name, instance id and port, taken from the `Environment`, ar
To disable the Consul Discovery Client you can set `spring.cloud.consul.discovery.enabled` to `false`.
To disable the service registration you can set `spring.cloud.consul.discovery.register` to `false`.
=== HTTP Health Check
The health check for a Consul instance defaults to "/health", which is the default locations of a useful endpoint in a Spring Boot Actuator application. You need to change these, even for an Actuator application if you use a non-default context path or servlet path (e.g. `server.servletPath=/foo`) or management endpoint path (e.g. `management.context-path=/admin`). The interval that Consul uses to check the health endpoint may also be configured. "10s" and "1m" represent 10 seconds and 1 minute respectively. Example:
@@ -151,7 +153,7 @@ config/application/
The most specific property source is at the top, with the least specific at the bottom. Properties in the `config/application` folder are applicable to all applications using consul for configuration. Properties in the `config/testApp` folder are only available to the instances of the service named "testApp".
Configuration is currently read on startup of the application. Sending a HTTP POST to `/refresh` will cause the configuration to be reloaded. Watching the key value store (which Consul supports) is not currently possible, but will be a future addition to this project.
Configuration is currently read on startup of the application. Sending a HTTP POST to `/refresh` will cause the configuration to be reloaded. <<spring-cloud-consul-config-watch>> will also automatically detect changes and reload the application context.
=== How to activate