tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-21 01:42:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
416 Commits 1 Branch 0 Tags
Commit Graph

416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
geffzhang
bc5f284afa Merge pull request #6 from TomPallister/develop 
Merge  CircuitBreakerPattern
 2017-02-10 07:05:24 +08:00
Tom Pallister
ce83c7dfff Merge pull request #27 from geffzhang/CircuitBreakerPattern 
Circuit breaker pattern
 2017-02-09 19:32:23 +00: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
48a62382fe changes missed 2017-02-08 18:53:52 +00: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
9d790a449b more refactoring of fileconfig creator 2017-02-08 18:23:07 +00:00
Tom Gardham-Pallister
26ac0fd3f4 more refactoring 2017-02-08 07:49:50 +00:00
Tom Gardham-Pallister
dbe28d38bc tidying up configuration creation 2017-02-08 07:37:04 +00:00
geffzhang
78ff96375e Merge branch 'develop' into CircuitBreakerPattern 2017-02-08 09:32:00 +08: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
d2a31d0cc5 Merge branch 'release/1.3.0' 2017-02-07 20:21:51 +00:00
Tom Pallister
c909aa2ea1 Merge pull request #30 from TomPallister/feature/testing-release-process 
test commit
 2017-02-07 20:09:53 +00:00
TomPallister
c839c17c62 test commit 2017-02-07 20:04:08 +00:00
TomPallister
ca9b4b94f4 Merge branch 'release/1.1.1' 2017-02-07 19:44:55 +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
616ca4f730 update sdk version 2017-02-07 19:50:09 +08: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
geffzhang
456c2b9c89 Merge branch 'develop' of https://github.com/geffzhang/Ocelot into develop 2017-02-07 11:22:41 +08:00
geffzhang
f04988f7ae Merge remote-tracking branch 'refs/remotes/TomPallister/develop' into develop 2017-02-07 11:22:30 +08:00
geffzhang
338d1c0c3c Merge pull request #5 from TomPallister/develop 
merge servicediscovery
 2017-02-07 07:26:37 +08:00
Tom Pallister
9e9303c25f Merge pull request #28 from TomPallister/feature/servicediscovery 
Feature/servicediscovery
 2017-02-06 22:13:21 +00:00
Tom Gardham-Pallister
86a197e22d merged develop 2017-02-06 22:06:18 +00:00
Tom Gardham-Pallister
201b470cb2 updated readme for service discovery 2017-02-06 22:03:48 +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 Pallister
84f01433b5 Update README.md 2017-02-04 11:47:07 +00:00
Tom Gardham-Pallister
9c9315a94f updated tests url 2017-02-03 22:59:00 +00:00
Tom Gardham-Pallister
2a03d33d7e added cake log back in 2017-02-03 22:53:53 +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 Pallister
4577ec60d5 Update README.md 2017-02-03 08:59:45 +00:00
Tom Pallister
c88eeb66bb Update README.md 2017-02-03 08:58:56 +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
Tom Gardham-Pallister
aef6507da3 fixed failing tests after service discovery changes 2017-02-03 07:43:26 +00:00
geffzhang
2e0bd6d556 Merge pull request #2 from TomPallister/develop 
merge current code
 2017-02-03 14:58:57 +08:00
geffzhang
883be802b3 Refactor CircuitBreaker Pattern 
Add Qos Config in ReRoute And Refactor CircuitBreakingDelegatingHandler
 2017-02-03 14:49:46 +08:00
Tom Gardham-Pallister
f2c6d1c799 load balancer middle ware test and cake mac osx build script 2017-02-02 22:34:46 +00:00