Commit Graph

1299 Commits

Author SHA1 Message Date
Spencer Gibb
9eed249028 Allow customization of HttpClient.
Uses ribbon settings to set MaxConnTotal and MaxConnPerRoute. Also allows user to create a custom HttpClient as a constructor argument.

fixes gh-1149
2016-09-22 19:42:20 -06:00
Spencer Gibb
bbff2b24d0 Put Apache Http Client and OkHttpClient in ribbon context.
This eliminates them being created for every zuul request.

Also makes properties consistent accross modules: ribbon.httpclient.*, ribbon.restclient.* and ribbon.okhttp.*

fixes gh-1150
2016-09-22 15:46:53 -06:00
Ryan Baxter
b91fa734d2 Bumping versions for next release 2016-09-22 14:55:08 -04:00
Ryan Baxter
302eae6aeb Revert "version changes for Camden release"
This reverts commit 088afa6d71.
2016-09-22 14:21:39 -04:00
Ryan Baxter
088afa6d71 version changes for Camden release 2016-09-22 13:15:22 -04:00
Dave Syer
5f96c415e3 Upgrade xstream to 1.4.9
Fixes XXE vulnerability in Eureka Server (external entity processing
on by default in older versions of the library).
2016-09-22 16:23:27 +01:00
Ryan Baxter
6c9fa68d5a Translate ribbon.ReadTimeout to apache http client socket timeout. Fixes #1357. (#1358) 2016-09-21 14:03:14 -04:00
Dave Syer
bc4f5a3788 Ensure version is scraped from parent pom 2016-09-20 13:34:30 +01:00
Dave Syer
f094ecfd88 Allow user to set system properties to control http client in zuul
The SimpleHostRoutingFilter now accepts normal -Dhttps.proxy= and
-Dhttps.port= settings (and other things that generally work with
java.net).

Fixes gh-510
2016-09-20 12:30:49 +01:00
Marcin Grzejszczak
13268f7c63 Updating mvnw for all projects 2016-09-19 19:31:33 +02:00
Marcin Grzejszczak
aa820ce347 Updating mvnw for all projects 2016-09-19 14:18:37 +02:00
Dave Syer
6310059531 Move unnecessary dependencies up a level 2016-09-19 12:02:34 +01:00
Marcin Grzejszczak
6f92859608 Updating mvnw for all projects 2016-09-19 12:46:58 +02:00
Spencer Gibb
758ff920fc Merge pull request #1351 from VanRoy/improve-formbodywrapperfilter-test
* improve-formbodywrapperfilter-test:
  Add test on FormBodyWrapperFilter to avoid regressions (#1171)
2016-09-16 14:42:48 -06:00
Julien Roy
7ba8063940 Add test on FormBodyWrapperFilter to avoid regressions (#1171) 2016-09-16 14:42:31 -06:00
Niklas Herder
61de118130 Use management.port for locating hystrix.stream (#1317)
Allow override of /hystrix.stream location via management.port metadata.
2016-09-16 15:15:46 -04:00
Matthew Jenkins
4bf64f7005 Use statusPage/healthCheckUrlPath w/ custom management.port (#1349)
Use statusPage/healthCheckUrlPath w/ custom management.port

Added RelaxedPropertyResolver to handle multiple valid formats for
eureka properties.  Added tests.

Fixes gh-1348
2016-09-15 21:20:35 -04:00
Spencer Gibb
85eab87dce formatting 2016-09-15 08:34:59 -06:00
rockinrimmer
5ba0cc5860 Check if object is already a ResponseEntity, if so return instead of … (#1343)
* Check if object is already a ResponseEntity, if so return instead of wrapping in another ResponseEnitiy. Which caused headers and status code from original ResponseEnitiy to be lost and for body to be output with whole ResponseEntity instead of just the body

* added test
2016-09-15 10:15:42 -04:00
Marcin Grzejszczak
08aae5be3b Updating mvnw for all projects 2016-09-15 16:13:07 +02:00
Ryan Baxter
027e7fc5c6 Merging changes from #1338 2016-09-13 08:57:01 -04:00
Spencer Gibb
498e8a1486 Use default maxSemaphore property.
Rather than hard code the default maxSemaphores for zuul use the already defined `zuul.semaphore.maxSemaphores` property.

fixes gh-1332
2016-09-12 09:36:22 -06:00
Ryan Baxter
09c6bc1d12 Merge pull request #1325 from herder/fix_registry_failures_report_time_mismatch
Fix lastFetch status calculation.
2016-09-08 09:38:09 -04:00
Niklas Herder
62521f38e8 Fix lastFetch status calculation.
Was previously milliseconds/seconds when calculating whether to display the message about reporting failures.
2016-09-08 11:24:11 +02:00
Spencer Gibb
a6785afa5a Exclude commons-logging from archaius starter
fixes gh-126
2016-09-07 11:16:51 -06:00
Marcin Grzejszczak
7ebb46a092 Removed adoc footer 2016-09-07 18:02:13 +02:00
Marcin Grzejszczak
a9fcc0a002 Updating mvnw for all projects 2016-09-07 17:29:18 +02:00
Ryan Baxter
08ed3c7fc4 Revert "Updated versions for Camden.RC1 release"
This reverts commit 3c1a23e7b1.
2016-09-06 14:25:21 -04:00
Ryan Baxter
3c1a23e7b1 Updated versions for Camden.RC1 release 2016-09-06 14:16:23 -04:00
Spencer Gibb
c7403361fd polish 2016-09-06 08:40:49 -06:00
Sébastien Nussbaumer
d9efb0a84d Allow Content-Length header with values greater than 2 GB (#1320)
fixes gh-1319
2016-09-06 10:38:16 -04:00
Ryan Baxter
4f81255970 Merge pull request #1318 from jkschneider/no-commons-lang
Remove dep on commons-lang in DimensionalServoMetricNaming (#1268)
2016-09-06 07:45:24 -04:00
Jon Schneider
e556ef84a4 Eliminate dependency on commons-lang in DimensionalServoMetricNaming (#1268) 2016-09-02 22:06:18 -07:00
Jon Schneider
9587003d44 Sanitize Servo metric tag key/value pairs before publishing to Atlas (#1315) 2016-09-01 17:32:30 -04:00
Jon Schneider
8f7ea41fe8 Log partial failure reasons for metrics batches published to Atlas (#1314) 2016-09-01 14:57:52 -04:00
Jon Schneider
b4284d18d5 Escape regex path variables in the uri tag for Spectator (#1311) 2016-09-01 11:27:30 -04:00
Spencer Gibb
048d401309 Merge pull request #1310 from garciafl/master
* garciafl-master:
  Removes RibbonCommand suffix.
2016-09-01 09:24:39 -06:00
Garcia Florian
85a1f3ec20 Removes RibbonCommand suffix.
This is a regression that was originally fixed in 1.1.x

Fixes gh-1308
2016-09-01 09:23:24 -06:00
Spencer Gibb
959b007269 removed duplicate feign ApacheHttpClient configuration 2016-08-31 12:02:25 -06:00
Spencer Gibb
9b550f7293 Support delete with body in zuul where possible.
The apache http client and ok http client support delete with body, ribbon rest client does not.

fixes gh-949
2016-08-31 11:43:05 -06:00
Spencer Gibb
dc26b1efa8 Merge pull request #1102 from lowzj/request-param-processor
* lowzj-request-param-processor:
  update RequestParamParameterProcessor to support map param
2016-08-31 11:05:05 -06:00
lowzj
d356e57134 update RequestParamParameterProcessor to support map param
fixes gh-1097
2016-08-31 11:04:20 -06:00
Spencer Gibb
c5b0ffe310 Document customizing the Ribbon Client using properties
fixes gh-1188
2016-08-30 10:17:04 -06:00
Spencer Gibb
1ffa7825ed Add {spring-cloud-version} 2016-08-30 09:58:21 -06:00
Spencer Gibb
d95f3cd1c5 Mention starters to include for features.
fixes gh-1134
2016-08-30 09:44:18 -06:00
Spencer Gibb
6ba64d97c8 Upgrade feign to 9.3.1
fixes gh-1303
2016-08-30 09:22:40 -06:00
Spencer Gibb
fa508a2c7e Add warning for eureka healthcheck.
fixes gh-1276
2016-08-30 09:14:32 -06:00
Spencer Gibb
d04df564f0 Try and fix old static wonkiness in test. 2016-08-29 12:47:35 -06:00
Spencer Gibb
5f192dd6ce Fix NPE when instance has no status page url.
fixes gh-1285
2016-08-29 12:29:57 -06:00
Spencer Gibb
6819922d26 Fix MetricsTagProvider for non web apps.
Guard creating and creation of classes that use it with @ConditionalOnClass(name = "javax.servlet.http.HttpServletRequest")

fixes gh-1302
2016-08-29 10:43:17 -06:00