Commit Graph

119 Commits

Author SHA1 Message Date
Dave Syer
6fefb39f86 Update to 1.0.1 snapshots 2016-05-11 09:27:50 +01:00
Spencer Gibb
ca9b92f98f Revert "Update SNAPSHOT to 1.0.0.RELEASE"
This reverts commit c29a544409.
2016-05-10 14:53:25 -06:00
Spencer Gibb
c29a544409 Update SNAPSHOT to 1.0.0.RELEASE 2016-05-10 14:50:18 -06:00
Dave Syer
c5a5c6bd98 Fix dependency order to nail spring-core version 2016-05-09 09:33:56 +01:00
Spencer Gibb
c4fb6b1cf8 More spring-core fixes 2016-05-06 11:32:24 -06:00
Bill Gray
bd50d543ba log consul deregister calls, for consistency with logging of consul register calls 2016-04-27 13:10:45 -06:00
Spencer Gibb
6e00f9ac5d set server.port 2016-04-25 16:53:05 -06:00
Marcin Grzejszczak
2234960ae5 Using unique identifiers for tests 2016-04-21 11:51:33 +02:00
Dave Syer
1f961b2091 Revert to snapshots 2016-04-18 14:51:14 +01:00
Dave Syer
bfea7109f8 Update to RC2 2016-04-18 14:50:45 +01:00
Joseph Athman
4023dfbd30 Add the ability to pass along query parameters to Consul when discovering services. One potential use is for passing a different data center value than the default value. 2016-04-06 12:35:29 -06:00
Spencer Gibb
8d43d78959 Make dealing with catalog watch errors easier.
Uses logger to log errors. Adds ability to disable watch.

see gh-169
2016-04-06 11:58:13 -06:00
Spencer Gibb
a78a567cce Implement ServiceInstance.getMetadata
Consul does not yet support metadata on services. Spring Cloud's `ServiceInstance` has a `Map<String, String> metadata` field. Spring Cloud Consul uses Consul tags to approximate metadata until Consul officially supports metadata. Tags with the form `key=value` will be split and used as a `Map` key and value respectively. Tags without the equal `=` sign, will be used as both the key and value.

fixes gh-162
2016-04-04 21:06:58 -06:00
Spencer Gibb
02d740fdf9 Prepare consul discovery to lookup configserver.
fixes gh-167
2016-04-04 10:57:02 -06:00
Spencer Gibb
79c50f0fc5 Fix NPE if spring.application.name is not set. 2016-04-01 17:52:01 -06:00
Spencer Gibb
314b159a84 Revert "Update SNAPSHOT to milestone 1.0.0.RC1"
This reverts commit e4c066b0b7.
2016-03-23 10:24:27 -06:00
Spencer Gibb
e4c066b0b7 Update SNAPSHOT to milestone 1.0.0.RC1 2016-03-23 10:15:42 -06:00
Spencer Gibb
e4fb366009 Allow to not register a healthcheck.
Useful for development.
2016-03-21 15:05:06 -06:00
Spencer Gibb
a6803340c2 prove s.c.c.discovery.{hostname|ipAddress} work 2016-03-21 11:47:21 -06:00
Spencer Gibb
8db3c72c33 Allow s.c.c.d.register=false to disable registering.
fixes gh-155
2016-03-16 13:32:35 -06:00
Spencer Gibb
0f6319b88a Don't require ServerProperties for ConsulDiscoveryClient.
for apps not registering with consul (cli apps).

Fixes gh-149
2016-03-10 18:19:14 -07:00
Spencer Gibb
f99f61d89b Move o.s.c.util to o.s.c.commons.util 2016-03-02 10:28:31 -07:00
Spencer Gibb
3f3fccd01a Add the option to only query for services that are passing health checks. 2016-02-24 16:45:41 -07:00
Spencer Gibb
db62855c22 More efficient ServerListFilter.
Discovery now uses /v1/health/service/<serviceId> rather than /v1/catalog/service/<serviceId> which provides health checks.

HealthServiceServerListFilter now uses the health check to return only PASSING servers.

This eliminates extra calls to consul.

fixes gh-116
2016-02-24 16:36:58 -07:00
Spencer Gibb
a58311f1a0 Always pass acl token (even if null). Add consul.token shortcut. 2016-02-10 18:50:44 -07:00
Spencer Gibb
c2dc040199 fix service name 2016-02-09 21:17:24 -07:00
Bill Gray
1e1d3c7864 add acl tests and setup test instance of consul to support acl testing 2016-02-09 18:03:56 -07:00
Spencer Gibb
bb7cd15b11 move to container builds 2016-02-09 17:09:57 -07:00
Daniel Hopper
b8f4453c1f Added support for customizing address for service via addressSource (agent of lookup) 2016-02-09 16:48:05 -07:00
Spencer Gibb
304b913e18 Comment out hanging test 2016-02-08 18:16:47 -07:00
Marcin Grzejszczak
8e4d101b16 Revert to snapshots 2016-02-05 12:01:44 +01:00
Marcin Grzejszczak
8c0ac35a5e Update to 1.0.0.M6 2016-02-05 11:54:11 +01:00
Spencer Gibb
1c18c220fc Use spring-retry for consul config and discovery.
fixes gh-81
2016-02-02 16:32:12 -07:00
Marcin Biegan
9ae48f0634 Allow customizable discovery configuration
Added @ConditionalOnMissingBean to ConsulDiscoveryClientConfiguration
to make it possible to provide custom implementations.

Some general polish

fixes gh-119
2016-01-21 14:12:46 -07:00
Spencer Gibb
91ac920a70 Merge pull request #131 from split3/feature/service-name-refactor
Refactoring serviceId to serviceName
2016-01-20 15:55:33 -07:00
Spencer Gibb
abb6e8ab5d Filter services by tag.
fixes gh-18
2016-01-19 14:16:56 -07:00
Daniel Hopper
a0301fd9d0 Refactoring serviceId to serviceName 2016-01-18 10:23:52 -05:00
Daniel Hopper
383910e034 Allow service that will be defined to have the name customizable but defaulting to the Application Name 2016-01-14 16:58:21 -07:00
Daryl Robbins
ce5dd14f26 Add support for registering using an alternate external port 2016-01-13 15:17:40 -07:00
Spencer Gibb
b748e8fa83 Update archaius dependency management.
Use new spring-cloud-starter-archaius to manage archaius dependencies.
2016-01-12 11:51:06 -07:00
Spencer Gibb
0d2dc42f55 Implement http check timeout + polish 2016-01-11 15:34:00 -07:00
Spencer Gibb
1d52344ac8 Let spring-cloud-netflix manage netflix deps.
Bumps consul-api to 1.1.8.
2016-01-11 15:24:21 -07:00
Spencer Gibb
5778182a8f Update to use new InetUtils bean for nic discovery. 2015-12-22 18:19:38 -07:00
Spencer Gibb
c54cb8b827 Revert "Update SNAPSHOT to MILESTONE 1.0.0.M5"
This reverts commit d883f5d1bb.
2015-12-22 11:53:44 -07:00
Spencer Gibb
d883f5d1bb Update SNAPSHOT to MILESTONE 1.0.0.M5 2015-12-22 11:51:20 -07:00
Spencer Gibb
a54283859d add s-c-context dependency 2015-12-18 09:07:57 -07:00
Rafael Zanella
6706738be9 Use getFirstNonLoopbackAddress() from cloud commons 2015-12-16 16:24:34 -02:00
Spencer Gibb
4698753d35 Only use preferIpAddress for data sent to consul.
fixes gh-114
2015-11-20 13:36:30 -07:00
Spencer Gibb
518958e408 Don't throw exception in getLocalServiceInstance
fixes gh-112
2015-11-18 14:06:40 -07:00
Spencer Gibb
d447374722 Revert Update SNAPSHOT to MILESTONE 1.0.0.M4 2015-11-17 13:45:29 -07:00