Spencer Gibb
b10bf9c305
Use eureka securePort if enabled for turbine http aggregation.
...
fixes gh-417
2015-09-25 17:08:15 -06:00
Spencer Gibb
7cf0fa4824
add support for HasFeatures
2015-09-25 16:08:37 -06:00
Spencer Gibb
0a2d1703f7
Update to new stream ChannelBindingServiceProperties
2015-09-25 16:07:51 -06:00
Spencer Gibb
befcada46d
formatting
2015-09-25 14:33:50 -06:00
Spencer Gibb
d29839ea3f
Merge pull request #555 from sfat/patch-1
...
Clicking running instances in eureka admin page
2015-09-25 10:04:52 -06:00
Andrei Sfat
60b437e2c5
Update eureka admin page
...
When click one of the up and running instances this should open the actual instance in separate tab
2015-09-25 15:42:18 +03:00
Dave Syer
d1cb42946b
Explicitly snag secure URL for config server if desired
...
If the configserver registers with securePortEnabled=true we should
respect that in the discovery process.
Fixes gh-450
2015-09-25 13:39:45 +01:00
Dave Syer
3697ce7fd9
Fix broken test (assumptions about eureka-first)
2015-09-25 13:29:44 +01:00
Spencer Gibb
0204978b36
Upgrade eureka to 1.2.5.
...
Change EurekaInstanceConfig.getSID to getInstanceId
fixes gh-554
2015-09-24 22:23:17 -06:00
Spencer Gibb
da04c53726
use new commons code to provide hostInfo.
...
Set the default sid from common properties.
2015-09-24 17:20:31 -06:00
Jon Schneider
8f9acab3bd
Update Eureka to 1.2.5-rc.1
...
Remove Servo from EurekaHealthIndicator.
Remove custom DataCenterInfo.
EurekaInstanceConfig.SID is now used as eureka id.
EurekaInstanceConfigBean.getSID falls back to metadataMap.instanceId for
backwards compatibility.
2015-09-24 15:34:17 -06:00
Dave Syer
ded968ad58
Ensure changes to eureka metadata are relected on refresh
...
And also when using eureka-first for discovering config server.
The EurekaClient is very rigid and initializes itself, registering
with the remote service on instantiation. Hance it needs to be
in @RefreshScope for it to be properly refreshable. Doing that
leads to a sequence of other changes (e.g. to account for the
fact that there is no @RefreshScope in bootstrap context).
Fixes gh-551
2015-09-24 13:37:17 +01:00
Spencer Gibb
581e9bbd58
Upgrade Hystrix to 1.4.15
...
fixes gh-534
2015-09-23 15:40:13 -06:00
Dave Syer
cf3ae735b2
Fix test (exclude commons refresh processing if not available)
2015-09-23 14:43:16 +01:00
Dave Syer
797544e668
Clean up eureka lifecycle
...
When the parent (bootstrap) context registers the app as well as consuming
the registry it causes problems, e.g. when you refresh that context is
re-created and destroyed, which tends to unregister the app and it's hard
to get it back. It is simpler if the parent context use eureka read-only.
To ensure this we have to remove the @EnableDiscoveryClient from the
bootstrap context.
Tested with vanilla config server and eureka with the 'eureka-first'
sample and the 'zuul-proxy-eureka' sample.
Fixes gh-421
2015-09-23 14:15:07 +01:00
Dave Syer
eb8a902056
Ensure eureka client re-registers after config client activity
...
Reverts part of a change made for gh-349 and rationalizes a bit of the
Eureka configuration. The Eureka client cannot be shutdown without
attempting to restart it (but there isn't an obvious public API for
that), so it's better not to shut it down at all.
See gh-421
2015-09-23 13:02:15 +01:00
Dave Syer
61294659bf
Add back (and deprecate) old 'amqp' poms
2015-09-23 09:46:49 +01:00
Spencer Gibb
0d92cb0803
allow defaults for spring-cloud-stream bindings
2015-09-22 16:15:54 -06:00
Spencer Gibb
639a87bfa1
Port *-amqp to spring-cloud-stream.
...
Move turbine/hystrix amqp specific implementations to spring-cloud-stream based implementations and let the user decide which broker to use.
fixes gh-545
2015-09-22 09:42:45 -06:00
Spencer Gibb
9e817a7dce
Downgrade hystrix to 1.4.14
...
1.4.15 isn't in maven central yet
2015-09-14 13:07:25 -06:00
Spencer Gibb
1888a4496a
Upgrade hystrix to 1.4.15
...
fixes gh-534
2015-09-14 12:58:45 -06:00
Spencer Gibb
741908155a
Upgrade feign to 8.10.0
...
fixes gh-540
2015-09-14 12:55:13 -06:00
Spencer Gibb
c15fb33fc2
add ResponseEntity<Void> feign test
...
see gh-539
2015-09-14 12:48:36 -06:00
Spencer Gibb
4037f4ca80
Add initialization of JsonXStream back.
...
fixes gh-535
2015-09-10 12:59:24 -06:00
Spencer Gibb
d72c9f0dc4
make use of 'metadataMap.instanceId' consistent
2015-09-10 12:18:31 -06:00
Spencer Gibb
bea48c5150
Merge pull request #515 from CPGFinanceSystems-master
...
* CPGFinanceSystems-master:
Add X-Forwarded-Proto HTTP header to zuul proxy requests
2015-09-08 12:34:08 -06:00
Forstner Michael
cbc7aa37f4
Add X-Forwarded-Proto HTTP header to zuul proxy requests
...
If the zuul reverse proxy and the destination services are using a different scheme
(for example HTTPS on proxy side and HTTP on service side) an additional HTTP
header is required according to RFC7239 [http://tools.ietf.org/html/rfc7239 ]
2015-09-08 12:20:16 -06:00
Spencer Gibb
46860e5c2c
Merge pull request #519 from spring-cloud/adrian.feign-bump
...
Bumps to Feign 8.8.1
2015-09-08 11:48:15 -06:00
Dave Syer
ee5b9c6382
Revert back to snapshot
2015-09-08 16:39:58 +01:00
Dave Syer
a11a7709bf
Bump to M1
2015-09-08 16:39:15 +01:00
Adrian Cole
c25e950914
Bumps to Feign 8.8.1
2015-09-08 17:29:33 +02:00
Adrian Cole
12b8e52f70
Merge pull request #513 from spring-cloud/feign-eager-instantiation-problem
...
Change from @Autowired to context.getBean
2015-09-08 14:23:47 +02:00
Spencer Gibb
f60cc6fb42
Change from @Autowired to context.getBean.
...
Solves problems where FeignClientFactoryBean is run before auto-configuration.
fixed gh-441
2015-09-04 15:22:48 -06:00
Spencer Gibb
67f0035885
update README from sources
2015-09-04 09:40:38 -06:00
Spencer Gibb
a92307b060
Merge pull request #512 from geoand/doc-fix
...
Replaced incorrect @PathParameter with @PathVariable
2015-09-04 09:37:44 -06:00
Spencer Gibb
b55832e5ef
removed unused README
2015-09-03 17:41:34 -06:00
Spencer Gibb
304e836980
Merge pull request #509 from jmnarloch/eureka-healthcheck
...
* eureka-healthcheck:
Eureka health check
2015-09-03 17:40:01 -06:00
Jakub Narloch
c9008ea277
Eureka health check
2015-09-03 17:39:22 -06:00
gandrianakis
654ccf2dea
Replaced incorrect @PathParameter with @PathVariable
2015-09-03 12:15:56 +03:00
Dave Syer
72c89c51e6
Fix autoconfig ordering so that health indicators always work
2015-09-02 13:27:49 +01:00
Spencer Gibb
e31f41c2a9
Created StaticServerList and updated tests to use it.
2015-08-31 12:45:30 -06:00
Spencer Gibb
aef6d2a326
Use localhost if non-loopback lookup fails
2015-08-31 12:11:42 -06:00
Spencer Gibb
62129c72c2
fix condition for selfPreservationMode
2015-08-25 16:32:02 -06:00
Dave Syer
80f2735ea5
Merge branch '1.0.x'
...
Conflicts:
.travis.yml
2015-08-25 15:13:20 +01:00
Dave Syer
7fc9811975
Use TRAVIS_BRANCH if available
2015-08-25 14:52:31 +01:00
Dave Syer
b3ca7430b0
Move ghpages to script
2015-08-25 14:15:51 +01:00
Dave Syer
00cc64c6c5
Different special treatment of README
2015-08-25 14:04:43 +01:00
Dave Syer
c905822005
Special treatnment of README
2015-08-25 12:56:15 +01:00
Dave Syer
56fae9330f
Try to debug CI failures
2015-08-25 12:44:08 +01:00
Dave Syer
c1cb0025c1
Use subdirectory for gh pages docs
2015-08-25 12:37:15 +01:00