Ryan Baxter
02ec9bb98e
Merge remote-tracking branch 'Upstream/master' into http-client-centralization
2017-07-07 10:54:08 -04:00
Ryan Baxter
b2f608b884
OK HTTP Client changes
2017-07-07 10:10:53 -04:00
Gregor Zurowski
a496dc8170
Use constant utility classes instead of constant interfaces ( #2081 )
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-06 12:01:26 -04:00
Yongsung Yoon
8e11514e7c
Add options for RibbonCommand to use separate thread pools for hystrix ( #2074 )
...
* Add options for RibbonCommand to use separate thread pools for hystrix
* Remove lombok annotation and Add getter/setter for ZuulProperties$HystrixThreadPool
* Add doc about how to configure hystrix thread pools in Zuul Developer Guide
* Add testcases for HystrixThreadPoolKey of RibbonCommand
* Tiny change about if block in AbstractRibbonCommand
2017-06-30 20:03:52 -04:00
Spencer Gibb
5856d76e65
Merge branch '1.3.x'
2017-06-30 17:11:18 -06:00
Spencer Gibb
86b1f6ede3
Make aspect method public
...
fixes gh-2063
2017-06-30 17:10:27 -06:00
Ryan Baxter
572305d7c8
Fixing code formatting
2017-06-28 12:00:11 -04:00
Ryan Baxter
2aa93abc0f
Centralizing HTTP client creation and configuration
2017-06-28 11:43:52 -04:00
Brandon Atkinson
497b95ec64
Rename *Test.java -> *Tests.java. Fixes #2042
2017-06-19 20:41:54 -04:00
Ryan Baxter
5c035768b0
Merge remote-tracking branch 'origin/1.3.x'
2017-06-16 11:51:09 -04:00
Piotr Mionskowski
779b026e6b
Override getThreadPool from HystrixConcurrencyStrategy and delegate to
...
existing strategy if present. Fixes #2035
2017-06-15 06:06:58 +02:00
Dave Syer
d39a22945b
Merge branch '1.3.x'
2017-06-13 13:58:08 +01:00
Dave Syer
aac7799e3e
Clean up Zuul context in all tests
2017-06-13 13:57:16 +01:00
André Dörnbrack
0334c5a289
Cleanup. Cherry picking #2031 .
2017-06-09 12:42:12 -04:00
André Dörnbrack
12a9a2e485
code cleanup
2017-06-09 12:34:04 -04:00
Ryan Baxter
f9424231a9
Merge pull request #2031 from doernbrackandre/fix_whitespaces_in_retryable_status_codes_list
...
fixes a problem with whitespaces in list of retryable status codes
2017-06-09 12:00:38 -04:00
Dave Syer
d4ba70db5c
Merge branch '1.3.x'
2017-06-09 13:31:17 +01:00
Dave Syer
a59f5e1c4f
Clean up some resources to keep tests running
2017-06-09 13:24:57 +01:00
André Dörnbrack
4f148de74d
code cleanup
2017-06-09 13:37:56 +02:00
Ryan Baxter
484bde10b3
Adding 404 to list of retryable status codes
2017-06-08 16:18:11 -04:00
Ryan Baxter
8281757da8
Add path to try and fix intermittent failures with RetryableZuulApplicationTests pass
2017-06-08 15:43:15 -04:00
Ryan Baxter
4e25e2eb81
Revert "Trying a plain RestTemplate in an attempt to fix intermittent test failures."
...
This reverts commit f552426304 .
2017-06-08 15:34:57 -04:00
Ryan Baxter
f552426304
Trying a plain RestTemplate in an attempt to fix intermittent test failures.
2017-06-08 15:16:03 -04:00
Spencer Gibb
15295dd294
Merge remote-tracking branch 'origin/master'
2017-06-08 12:18:45 -06:00
Ryan Baxter
1405a1894b
Closing response in Feign load balancer
2017-06-08 13:48:56 -04:00
Ryan Baxter
a1c8cfe967
Close response when retry on certain status codes. Fixes #1970 .
2017-06-08 13:48:56 -04:00
Ryan Baxter
f0b424c84f
Merge pull request #2021 from ryanjbaxter/response-code-retry-close-wait
...
Close response when retry on certain status codes
2017-06-08 13:47:27 -04:00
Spencer Gibb
582746587b
Merge branch '1.3.x'
2017-06-08 11:35:45 -06:00
Spencer Gibb
a69fe71406
Make archaius highest priority auto-configuration.
2017-06-08 11:35:05 -06:00
Jin Zhang
c5d95ca805
SendErrorFilter: put response code into RequestContext, keep consistent with normal cases ( #2004 )
2017-06-07 12:06:35 -04:00
Ryan Baxter
0b2fc81be4
Closing response in Feign load balancer
2017-06-06 10:44:42 -04:00
Spencer Gibb
9e180b8ba7
Merge branch '1.3.x'
2017-06-05 16:41:57 -06:00
Spencer Gibb
e08a6e8a48
Move zuul host routing timeouts to boot properties.
...
Previously, these were managed directly via archaius, but due to
some combination of changes in boot 1.5.x (likely a tomcat change as
zuul filters were initialzed in a servlet context listener) and Dalston,
The filter was created before archaius could be initialized.
The properties are backwards compatible and are in the
`ZuulProperties.Host` object.
fixes gh-1950
2017-06-05 16:40:12 -06:00
Ryan Baxter
7d06c140fa
Close response when retry on certain status codes. Fixes #1970 .
2017-06-05 14:36:49 -04:00
Ryan Baxter
d914406c84
Merge pull request #2000 from rpahli/master
...
use only default https ports for https check
2017-06-01 20:08:10 -04:00
Biju Kunjummen
31a3ff61e8
GH-1916: Spring Boot Auto-configuration based Zuul Server and Proxy ( #1951 )
2017-06-01 15:12:42 -04:00
Spencer Gibb
3773047a06
Bump to version 1.4.0.BUILD-SNAPSHOT
2017-06-01 12:50:57 -06:00
pahli
a1d089038d
make property injection optional
2017-05-31 23:55:17 +02:00
pahli
71c906b00b
add private accessor
2017-05-31 22:33:10 +02:00
pahli
6d22a407cc
use @ConfigurationProperties
2017-05-31 22:25:51 +02:00
pahli
bdfbe3a87e
make secure ports for DefaultServerIntrospector configurable
2017-05-31 22:09:35 +02:00
Ryan Baxter
7dbfe15d1a
Deprecates RetryableStatusCodeException in favor of the same class in s-c-commons
2017-05-31 14:22:15 -04:00
Rico Pahlisch
ccf8f86c8d
use only default https ports for https check
...
spring boot uses all high ports and there are some trouble if ports end with 443 (e.g. 24443, ...)
2017-05-31 12:04:09 +02:00
Spencer Gibb
7425f974cb
Adds timeout test.
...
see gh-1950
2017-05-25 14:51:58 -06:00
Spencer Gibb
58e62ebd06
Bumping versions to 1.3.2.BUILD-SNAPSHOT after release
2017-05-22 12:18:04 -06:00
Spencer Gibb
0de72d2dad
Going back to snapshots
2017-05-22 12:18:03 -06:00
Spencer Gibb
7898ad772b
Update SNAPSHOT to 1.3.1.RELEASE
2017-05-22 12:09:31 -06:00
Spencer Gibb
25a1881127
Ignore feign.hystrix.enabled.
...
Let SecurityContextConcurrencyStrategy be installed as the hystrix
concurrency strategy regardless of if feign's hystrix support is installed.
fixes gh-1969
2017-05-22 09:47:49 -06:00
balp
6362be8196
Adds ability to customize simple host conn pool
...
The timeToLive and timeUnit parameters added to configure connection pool.
Fixes gh-1720
2017-05-19 18:22:04 -06:00
Luke Tornquist
73b5609e63
Allow easier subclassing of SimpleRouteLocator
...
Fixes gh-1598
2017-05-15 14:48:15 -04:00