89 Commits

Author SHA1 Message Date
TomPallister
eb5dfc6975 removed test configuration nonsense 2017-02-19 15:43:58 +00:00
Philip Wood
3c9ad87b73 Fix cake on Mac. Also added compile-time support for OSX.10.12-x64. The acceptance tests still fail on this version of OS X, however, because of the funky stuff going on in TestConfiguration.cs. Fixing this is outside the scope of this issue. 2017-02-19 15:03:11 +00:00
Tom Gardham-Pallister
b98310c80d working ssl example 2017-02-17 18:24:32 +00:00
geffzhang
f302ee77bf remove bak file 2017-02-15 08:54:20 +08:00
geffzhang
0aad1f8fa0 Merge remote-tracking branch 'refs/remotes/origin/develop' into RateLimit
# Conflicts:
#	src/Ocelot/Configuration/Builder/ReRouteBuilder.cs
#	src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
#	src/Ocelot/Configuration/QoSOptions.cs
#	src/Ocelot/Configuration/ReRoute.cs
#	test/Ocelot.AcceptanceTests/configuration.json
2017-02-15 08:49:40 +08:00
geffzhang
2fa6e66dd4 refactor code 2017-02-13 08:29:29 +08:00
geffzhang
e1f16c2be1 add ratelimit acceptance test 2017-02-12 15:49:21 +08:00
TomPallister
286c7f8488 Fixed issue where qos was being created for each request so circuit breaker was never stopping traffic going to downstream service. 2017-02-11 18:56:36 +00:00
TomPallister
820673dda8 added docs but qos acceptance test not working seems circuit never opens but not sure if it is meant to with timeouts..investigating 2017-02-11 15:11:10 +00:00
geffzhang
9b06afc781 refactor ratelimit config 2017-02-11 20:52:20 +08:00
TomPallister
e33fe4cf7d merged develop 2017-02-11 12:07:08 +00:00
geffzhang
e1d5ef3aae implement Request Rate limit, this feature is options 2017-02-11 16:32:30 +08:00
geffzhang
18e0f40c95 Fix should_use_global_request_id_and_forward not pass
This test needs UpstreamHttpMethod = "Get",
2017-02-09 08:30:32 +08:00
Tom Gardham-Pallister
0b9faca295 merged develop 2017-02-08 18:52:15 +00:00
geffzhang
caae826d77 Refactor qos as options 2017-02-08 09:25:32 +08:00
Tom Gardham-Pallister
7fffc9827a auth options builders 2017-02-07 20:30:26 +00:00
TomPallister
c839c17c62 test commit 2017-02-07 20:04:08 +00:00
geffzhang
b10c95219e merge circuitbreakerpattern code 2017-02-07 19:47:11 +08:00
geffzhang
a895fdfc12 Merge branch 'develop' into CircuitBreakerPattern 2017-02-07 18:41:11 +08:00
Tom Gardham-Pallister
b4ef277c3e added builder for service provider config 2017-02-07 07:50:23 +00:00
Tom Gardham-Pallister
86a197e22d merged develop 2017-02-06 22:06:18 +00:00
Tom Gardham-Pallister
c3e60ac08a wip: added some sleep time into service discovery test as I think Im overloading the test server, sometimes it just returns 404 when Ocelot makes a request to it 2017-02-05 22:00:23 +00:00
TomPallister
d91242ac2c wip: modifications to service discovery acceptance test to see if it will work on mac 2017-02-05 21:35:50 +00:00
TomPallister
932bcb73d4 wip: removed some debug statements and all tests passing on my PC...feel there is something wrong with the service discovery test around task execution not completing 2017-02-05 21:21:02 +00:00
Tom Gardham-Pallister
fb0f101732 wip fake consul provider 2017-02-05 21:08:16 +00:00
TomPallister
c46dcc05b8 started implementing the consul service provider 2017-02-04 13:16:31 +00:00
TomPallister
7900aa3f49 got sidetracked and downgraded to .net core app 1.1 that actually exists no idea why i had 1.4 :( 2017-02-04 12:06:33 +00:00
Tom Gardham-Pallister
9c9315a94f updated tests url 2017-02-03 22:59:00 +00:00
Tom Gardham-Pallister
9828c3b427 started adding consul acceptance test 2017-02-03 22:50:57 +00:00
geffzhang
883be802b3 Refactor CircuitBreaker Pattern
Add Qos Config in ReRoute And Refactor CircuitBreakingDelegatingHandler
2017-02-03 14:49:46 +08:00
tom.pallister
7fc92da012 Updated release script to use correct target name 2017-02-02 15:53:02 +00:00
TomPallister
2aa156d0a6 refactoring service discovery and load balancing approach into load balancing middleware 2017-02-01 22:00:01 +00:00
Philip Wood
2cd69d1908 #20 - added cake build to do same functionality as batch scripts. Also does semver versioning of assemblies, if running in AppVeyor, generates release notes and publishes packages to appveyor. 2017-01-24 21:11:15 +00:00
Tom Gardham-Pallister
c3a47f66c8 merge 2017-01-23 12:13:24 +00:00
TomPallister
6bf2d4677c started adding loadbalancers 2017-01-22 20:22:04 +00:00
TomPallister
0f71c040d9 split DownstreamTemplate into DownstreamPathTemplate, DownstreamScheme, DownstreamHost and DownstreamPort in order to prepare for service discovery 2017-01-21 09:59:47 +00:00
Tom Gardham-Pallister
622c49d057 removed comment 2017-01-17 15:59:39 +00:00
Tom Gardham-Pallister
8c213f133c test passing on mac and windows 2017-01-17 10:33:55 +00:00
Tom Gardham-Pallister
a8878b4a19 test passing on mac and windows 2017-01-17 10:20:49 +00:00
tom.pallister
b2d33f0ec5 Updated packages and fixed build errors and tests..now need to update nuspec 2017-01-11 17:23:34 +00:00
TomPallister
536db48049 fixed problems where routes were not mathing 2016-11-26 14:08:09 +00:00
TomPallister
ff5776613f Now defaults to case insensitive routing but you can override with a setting, also global request id setting available 2016-11-06 11:50:33 +00:00
TomPallister
47afc850ff Added some basic cache stuff 2016-11-04 15:05:59 +00:00
TomPallister
f4acb4f041 changed to json configuration to get rid of yaml imports 2016-11-02 21:50:53 +00:00
TomPallister
56bf4014bd Added request id functionality and general refactoring..also turned out i wasnt returning headers....sigh 2016-10-30 17:29:37 +00:00
TomPallister
f7f4a392f0 implemented adding claims as query strings to downstream route, removed some of the middleware injection optiosn as i have currently have no use case for them, general refactoring to use the OcelotMiddleware a bit more 2016-10-29 19:45:50 +01:00
TomPallister
3a1dd1f9bc fixed a bug where getting invalid parameter error if sending a steam content with no stream, now we try convert to byte array which the c# http client is happy to take if empty...or this error is caused because we are trying to use a stream when we shouldnt. 2016-10-28 22:50:00 +01:00
TomPallister
6be3c1cf73 Updated all packages and upgraded to 1.0.1 for asp.net 2016-10-26 21:49:07 +01:00
TomPallister
367fa327b3 bunch of refactoring 2016-10-26 21:38:44 +01:00
TomPallister
9c771bf9e0 added benchmarks back in, renamed data repository and a few other things 2016-10-24 19:32:52 +01:00