tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 21:10:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
800 Commits 1 Branch 0 Tags
9db4273f18e93d442bdd40ea5a7b798ccff72bcf
Commit Graph

410 Commits

Author SHA1 Message Date
TomPallister
d548a86327 Added integration test project as acceptance style doesnt work when running the new admin area because identityserver needs to use proper networking 2017-02-19 15:29:32 +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
TomPallister
d236ed3018 trying to get identity server authing 2017-02-19 13:59:17 +00:00
TomPallister
fa47663259 changed file config stuff to just use app base directory 2017-02-19 12:58:22 +00:00
Tom Gardham-Pallister
816221c7a6 morehaking about 2017-02-19 12:33:09 +00:00
Tom Gardham-Pallister
b98310c80d working ssl example 2017-02-17 18:24:32 +00:00
Tom Gardham-Pallister
4dac8cb4fb still hacking around 2017-02-17 07:27:49 +00:00
Tom Gardham-Pallister
219b45e7d0 updated acceptance test assertion 2017-02-15 07:51:19 +00:00
Tom Gardham-Pallister
8ae8e2d834 added acceptance test for calling reroutes controller 2017-02-15 07:48:49 +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
Tom Gardham-Pallister
ef3deec8da more hacking 2017-02-13 19:14:49 +00:00
Tom Gardham-Pallister
159969483b hacking away 2017-02-13 18:51:47 +00:00
Tom Gardham-Pallister
95fc687e93 started messing around with admin area 2017-02-13 12:13:53 +00:00
Tom Gardham-Pallister
0b830d9891 mapped admin path works for manual test 2017-02-13 07:42:31 +00: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
TomPallister
ce8da4c92d removed qos by accident, added back in 2017-02-11 13:14:25 +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
Tom Gardham-Pallister
f7fe7c0f49 more refactoring 2017-02-08 18:47:35 +00:00
Tom Gardham-Pallister
dbe28d38bc tidying up configuration creation 2017-02-08 07:37:04 +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
Tom Gardham-Pallister
33ce162693 changed upstream http method to use httpmethod class in .net 2017-02-07 18:30:21 +00:00
Tom Gardham-Pallister
bbb808eb51 fixed failing tests 2017-02-07 13:46:22 +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
6ad27ec17d made upstream template use template path object 2017-02-07 07:54:03 +00:00
Tom Gardham-Pallister
1671fadea3 made upstream template use template path object 2017-02-07 07:53:41 +00: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
0a66051b92 removed some code we dont need as not expecting any errors so should just throw an exception to the global handler 2017-02-06 21:47:08 +00:00
Tom Gardham-Pallister
a4495b8fa9 tests for error handling on load balancing middleware 2017-02-06 20:22:09 +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
tom.pallister
b0ff2fd317 fixed failing tests 2017-02-03 13:02:51 +00:00
Tom Gardham-Pallister
f285b0e0ad plugged load balancer middleware into Ocelot pipeline, load balanced downstream host and port now used by url creator middleware 2017-02-03 08:00:07 +00:00