Commit Graph

411 Commits

Author SHA1 Message Date
Brian
d8b1bc7ed8 annotate consul config properties as validated (#291) 2017-03-23 14:18:18 -04:00
Spencer Gibb
01d90cefb3 Going back to snapshots 2017-03-16 13:50:11 -06:00
Spencer Gibb
294ed149b8 Update SNAPSHOT to 1.2.0.RC1 2017-03-16 13:44:37 -06:00
Spencer Gibb
8d499ae0aa Remove hard coded version in readme 2017-03-16 13:26:18 -06:00
Spencer Gibb
00697989e3 Merge pull request #287 from knalx/master
* pull287:
  Fixes ipv6 formatting for consul discovery.
2017-03-07 10:49:52 -07:00
a.semenkov
d4ab3a1865 Fixes ipv6 formatting for consul discovery. 2017-03-07 10:49:41 -07:00
Spencer Gibb
73f9efa2e4 formatting 2017-02-28 14:18:04 -07:00
Spencer Gibb
90eeebf3e2 move boot managed deps to parent pom. 2017-02-28 14:15:11 -07:00
Spencer Gibb
b4e413f3b1 adds management.security.enabled=false 2017-02-28 14:14:45 -07:00
Jin Zhang
87252e728f ConsulServerList#toString(): use StringBuilder instead of StringBuffer (#283) 2017-02-28 13:01:34 -05:00
Abderrazak (عبدالرزاق)
9bcfee8a3a fixed management.context-path placeholder name (#284) 2017-02-28 11:20:13 -05:00
Spencer Gibb
e6cbd11a03 Merge pull request #233 from xetys/fix-discovery-acl
* fix-discovery-acl:
  Uses ACL token when fetching catalog services
2017-02-20 11:42:32 -07:00
David Steiman
3329f97cad Uses ACL token when fetching catalog services
Adds ACL token to consul client when fetching catalog services

fixes gh-201
2017-02-20 11:42:02 -07:00
Spencer Gibb
0a0b10a19b Create health check if discovery port is set.
If `spring.cloud.consul.discovery.port` is set, the health check was not getting created. Now it is.

fixes gh-281
2017-02-20 10:55:19 -07:00
Spencer Gibb
757fe1af31 Add support for spring.cloud.consul.config.name
fixes gh-279
2017-02-15 14:06:31 -07:00
Spencer Gibb
0dba5daba7 polish 2017-02-15 14:04:55 -07:00
Kamil Szymański
a48f79a405 remove unnecessary reference to outer class (#277) 2017-02-14 16:59:54 -05:00
Spencer Gibb
e49b8c0aca Handles null port.
fixes gh-276
2017-02-01 12:54:34 -07:00
Spencer Gibb
5b45629063 Revert "Update SNAPSHOT to 1.2.0.M1"
This reverts commit 01321d78bd.
2017-01-27 14:30:37 -07:00
Spencer Gibb
01321d78bd Update SNAPSHOT to 1.2.0.M1 2017-01-27 14:29:17 -07:00
Spencer Gibb
a242582e6c polish imports 2017-01-27 14:19:22 -07:00
Spencer Gibb
263177a9a6 Merge pull request #247 from jjathman/enable-extending-consul-server-list
* enable-extending-consul-server-list:
  Fixes #246 - allows for easier extending of the ConsulServerList class so customization of it's behavior can be done more easily.
2017-01-27 14:18:55 -07:00
Joseph Athman
5ff7967514 Fixes #246 - allows for easier extending of the ConsulServerList class so customization of it's behavior can be done more easily. 2017-01-27 14:16:02 -07:00
Spencer Gibb
1a040c0b85 Update to Dalston dependencies. 2017-01-27 14:12:12 -07:00
Spencer Gibb
673189aaea Guard binder configuration based on properties.
fixes gh-273
2017-01-26 13:41:22 -07:00
Spencer Gibb
6c264daace Update ConsulServiceRegistry.getStatus()
It now only returns UP or OUT_OF_SERVICE
2017-01-25 15:06:37 -07:00
Spencer Gibb
f9060823f5 Complete implementation of ServiceRegistry.
Specifically getStatus() and setStatus().

Rename serviceId to instanceId to be clearer.

Fixed ConsulLifecycle to honor overridden getServiceId().
2017-01-25 14:22:30 -07:00
Spencer Gibb
c4950d9138 polish 2017-01-17 11:14:08 -07:00
Danny Hamrick
b78812c66d Add support in ConfigWatch for acl token
Fixes gh-264
2017-01-17 11:02:44 -07:00
Spencer Gibb
9394885401 Merge pull request #239 from donnabelldmello/master
* pull239:
  Adds healthCheckCriticalTimeout to discovery props
2017-01-17 09:10:26 -07:00
Donnabell Dmello
c0e9795e98 Adds healthCheckCriticalTimeout to discovery props
The healthCheckCriticalTimeout property tells consul to deregister services in critical longer than timeout.

Fixes gh-210
2017-01-17 09:10:11 -07:00
Spencer Gibb
9d393d15b4 Upgrade consul-api to version 1.2.1
fixes gh-232
2017-01-17 08:25:21 -07:00
Spencer Gibb
dcf3f94e43 fixes broken test 2017-01-13 13:41:03 -07:00
Piotr Wielgolaski
c180105f8c Apply defaultQueryTag when querying for any service instance (#250)
fixes gh-225
2017-01-13 15:31:35 -05:00
Spencer Gibb
f1326433a2 Add @ConditionalOnConsulEnabled to service registry auto config 2016-12-12 11:06:16 -07:00
Spencer Gibb
2b4c2b078c polish 2016-12-09 11:45:38 -07:00
Spencer Gibb
a64ace4700 Shutdown scheduler in ConsulInboundMessageProducer
fixes gh-259
2016-12-09 11:44:43 -07:00
sakanaou
754c7477cd Avoid NPE if YAML/PROPERTIES data value is empty (#257)
Can happen if empty file content is sent to Consul's K/V store
or data is manually edited via the UI.
2016-12-08 14:43:23 -05:00
sakanaou
595951c30c YAML-based properties are not converted to String anymore (#258)
This allows for typesafe usage of values.
2016-12-08 14:42:09 -05:00
Spencer Gibb
91a26f6161 polish tests 2016-12-08 11:01:25 -07:00
Spencer Gibb
ade148bd16 Add missing tag functionality removed during merge. 2016-12-08 10:51:51 -07:00
Spencer Gibb
ba85624a98 Implements ConsulServiceRegistry and auto registration
No longer create ConsulLifecycle bean by default. It is now deprecated.

New auto registration is not created if user has created ConsulLifecycle
bean.
2016-12-08 10:14:08 -07:00
Spencer Gibb
29ae38d435 Update to SNAPSHOT 2016-11-28 13:41:09 -07:00
Jin Zhang
e1641b44ab ConsulServer support server group (#252)
Fixes gh-248
2016-11-28 14:43:44 -05:00
Spencer Gibb
5eaf6aa87a Update SNAPSHOT to 1.1.2.RELEASE 2016-11-28 10:09:48 -07:00
Max Liu
c259293933 Add service instance zone support. (#251)
fixes gh-249
2016-11-16 09:48:42 -07:00
Venil Noronha
184eec0f58 Enables failFast setting for consul service registration (#238)
Adds `spring.cloud.consul.discovery.failFast` which defaults to `true` (current behaviour).

fixes gh-175
2016-11-04 12:15:14 -04:00
Spencer Gibb
bf5ecf8a49 Decrease Watch.waitTime to 55.
So it is less than the ConsulRawClient.HttpClient timeout of 60s

fixes gh-240
2016-11-02 13:43:44 -06:00
Spencer Gibb
2e5d2b0d5e Merge pull request #241 from lowzj/TtlScheduler
cancel the previous ttl task when putting a new task with the same serviceId
2016-11-02 15:29:21 -04:00
lowzj
0605ce71a6 cancle the previous ttl task when putting a new task 2016-11-01 13:28:30 +08:00