tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2026-08-05 05:17:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
948 Commits 1 Branch 0 Tags
08c2ac1b052eebd521e1f22e6b57d10374bc1145
Commit Graph
79 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
geffzhangandGitHub 5fb54e8032 Merge pull request #52 from ThreeMammals/develop 
merge newest code
 2018-10-11 19:57:16 +08:00
geffzhangandGitHub e799f5792e Merge pull request #51 from ThreeMammals/develop 
Feature/adding some re route specific validation tests (#590)
 2018-09-11 11:17:47 +08:00
geffzhangandGitHub b334ed8b3a Merge pull request #50 from ThreeMammals/develop 
merge newest code
 2018-09-04 20:21:24 +08:00
geffzhangandGitHub ac1e3ae22a Merge pull request #49 from ThreeMammals/develop 
merge newestcode
 2018-07-28 17:40:02 +08:00
geffzhangandGitHub 2fded67de8 Merge pull request #48 from ThreeMammals/develop 
merge newest code
 2018-07-20 07:17:13 +08:00
geffzhangandGitHub cc33d9f86e Merge pull request #47 from ThreeMammals/develop 
merge newestcode
 2018-06-24 20:23:07 +08:00
geffzhangandTom Pallister 3ef978460c update LoadBalancer Options (#388) 
update LoadBalancer with LoadBalancerOptions
 2018-06-08 17:55:58 +03:00
geffzhangandGitHub 6f2eaa412f Merge pull request #46 from ThreeMammals/develop 
merge newest code
 2018-05-19 09:17:40 +08:00
geffzhangandGitHub 4a0d355446 Merge pull request #45 from ThreeMammals/develop 
merge newest code
 2018-05-13 11:22:10 +08:00
geffzhangandGitHub 03abfca543 Merge pull request #44 from ThreeMammals/develop 
merge newest code
 2018-05-01 08:34:50 +08:00
geffzhangandGitHub 2d01e96369 Merge pull request #43 from ThreeMammals/develop 
merge newest code
 2018-04-25 21:30:14 +08:00
geffzhangandGitHub 1a5687aca2 Merge pull request #42 from ThreeMammals/develop 
merge newest code
 2018-03-12 21:55:44 +08:00
geffzhangandGitHub 681f0551cd Merge pull request #41 from ThreeMammals/develop 
support_service_fabric
 2018-03-05 08:36:58 +08:00
geffzhangandGitHub c0ae4bc9ed Merge pull request #40 from TomPallister/develop 
merge downstream aggregation
 2018-03-02 07:30:40 +08:00
geffzhangandGitHub 6976ec668f Merge pull request #39 from TomPallister/develop 
merge use any id server for admin area
 2018-02-15 08:16:56 +08:00
geffzhangandGitHub 57d7b9dfde Merge pull request #38 from TomPallister/develop 
Merge Tracing
 2018-02-14 09:50:29 +08:00
geffzhangandTom Pallister ef3c4f614a Monitoring (#219) 
* feat：  use Https://github.com/ButterflyAPM to monitor each API request monitoring metrics

* feat: using DiagnosticSource and Butterfly.OpenTracing

* refactor：refactor Ocelot tracing， merge code into OcelotDiagnosticListener

* refactor: move OcelotHttpTracingHandler to Requester

* fix： Requester\HttpClientBuilder.cs(10,14): error CS0234: The type or namespace name 'Tracing' does not exist in the namespace

* feat: add test should_set_up_tracing

* feat : Remove extraneous code

* feat: remove unused DiagnosticSource diagnostic

* fix : test UseTracing

* add test should_call_scoped_data_repository_QosProviderError

* add test should_return_any_errors

* add test HttpClientHttpRequesterTest

*  it should keep it can not be deleted
 2018-02-12 18:33:23 +00:00
geffzhangandGitHub eca3290f71 Merge pull request #36 from TomPallister/develop 
Feature/issue 209 upstream host based routing (#216)
 2018-02-02 21:23:44 +08:00
geffzhangandGitHub 3e2c410626 Merge pull request #35 from TomPallister/develop 
Merge load balancing reroutes
 2018-02-02 08:50:40 +08:00
geffzhangandGitHub 112b4b69c6 Merge pull request #34 from TomPallister/develop 
merge newest code
 2018-01-22 19:01:15 -06:00
geffzhangandGitHub e3db60bd49 Merge pull request #33 from TomPallister/develop 
merge newest code
 2018-01-06 20:56:05 -06:00
geffzhangandGitHub 9a0096c4a6 Merge pull request #32 from TomPallister/develop 
merge 2.0.4
 2017-12-03 13:16:03 +08:00
geffzhangandGitHub b0f928127e Merge pull request #31 from TomPallister/develop 
mergecode
 2017-11-25 21:23:27 +08:00
geffzhangandGitHub c11321bb57 Merge pull request #29 from TomPallister/develop 
update .netcore 2
 2017-11-04 11:29:54 +08:00
geffzhangandGitHub 2c4aaaadaa Merge pull request #27 from TomPallister/develop 
merge newest code
 2017-08-26 09:45:51 +08:00
geffzhangandGitHub 88698d487f Merge pull request #26 from TomPallister/develop 
merge newest code
 2017-06-12 09:09:25 +08:00
geffzhang 4d8da86950 refactor: Refactor HttpClientHttpRequester Httpclient queue 2017-06-03 22:57:45 +08:00
geffzhang 0b09644d7e Fix Ratelimit every day, every minute, every hour logic bugs 2017-06-03 22:51:11 +08:00
geffzhang 02162dd7a6 RoundRobin loadblancer cause config error https://github.com/TomPallister/Ocelot/issues/103 2017-06-03 22:32:47 +08:00
geffzhangandGitHub 54db27100d Merge pull request #25 from TomPallister/develop 
merge newest code
 2017-05-18 08:45:50 +08:00
geffzhangandGitHub c76fa1e5fb Merge pull request #24 from TomPallister/develop 
mergeNewestcode
 2017-04-24 07:16:26 +08:00
geffzhangandGitHub 8533186cf0 Merge pull request #23 from TomPallister/develop 
config_in_consul
 2017-04-17 11:24:00 +08:00
geffzhangandGitHub 34070021ce Merge pull request #21 from TomPallister/develop 
refactor httpclientcache
 2017-04-06 07:46:11 +08:00
geffzhang 81e2e8a5be refactor : ConcurrentDictionary and ConcurrentQueue replace MemoryCache for cache HttpClient 2017-04-04 16:06:27 +08:00
geffzhangandGitHub 34325d7969 Merge pull request #20 from geffzhang/develop 
merge newest code
 2017-04-03 21:06:00 +08:00
geffzhangandGitHub 9e5faa268f Merge pull request #19 from TomPallister/develop 
updateLogger
 2017-03-20 13:06:49 +08:00
geffzhang aa66fdddd3 Merge branch 'develop' of https://github.com/geffzhang/Ocelot into develop 2017-03-18 19:58:04 +08:00
geffzhang faf6d40d73 refactor: TryAddSingleton replace AddSingleton 2017-03-18 19:56:08 +08:00
geffzhang 18d4013e61 Fix: This string.Equals Method Windows is normal, but running under Centos, due to a case of the string problem, seems to be. NET core implementation issues on a Linux system is case sensitive. 
Modifications are as follows
            var applicableReRoutes = configuration.Data.ReRoutes.Where(r => string.Equals(r.UpstreamHttpMethod.Method.ToLower(), upstreamHttpMethod.ToLower(), StringComparison.CurrentCultureIgnoreCase));
 2017-03-16 20:13:27 +08:00
geffzhangandGitHub 01fc26fb68 Merge pull request #18 from TomPallister/develop 
Renamed ScopeName to ApiName, ScopeSecret to ApiSecret
 2017-03-16 14:31:19 +08:00
geffzhangandGitHub 5f3d047475 Merge pull request #17 from TomPallister/develop 
upgraded to vs2017
 2017-03-12 19:48:04 +08:00
geffzhangandGitHub 7d4ef438b9 Merge pull request #16 from TomPallister/develop 
refactor: HttpClientCache
 2017-03-09 12:07:33 +08:00
geffzhangandGitHub 5728530942 Update global.json 
revert global.json sdk to 3133
 2017-03-07 08:41:28 +08:00
geffzhangandGitHub 2e1708ef1e Merge branch 'develop' into feature/Optimization-HttpClient-instance 2017-03-07 08:37:16 +08:00
geffzhang 23ad6ed264 refactor: HttpClientCache and remove not used code current 2017-03-07 08:29:03 +08:00
geffzhangandGitHub 9acabed31f Merge pull request #15 from TomPallister/develop 
merge newest code
 2017-03-06 07:24:48 +08:00
geffzhang 10db534008 Refactor HttpClientHttpRequester Cache HttpClient 2017-03-04 18:18:00 +08:00
geffzhangandGitHub 1f2d77e8f9 Merge pull request #14 from TomPallister/develop 
fix：updated readme to explain how to run integration tests
 2017-03-04 12:39:55 +08:00
geffzhang 4bd14f7537 Merge branch 'develop' of https://github.com/geffzhang/Ocelot into develop 2017-02-26 14:06:28 +08:00
geffzhangandGitHub 26c7d1e37b Merge pull request #13 from TomPallister/develop 
Update Ocelot configuration without downtime
 2017-02-26 10:56:36 +08:00
geffzhangandGitHub a32f23ef05 Merge pull request #12 from TomPallister/develop 
merge newest code
 2017-02-24 07:16:46 +08:00
geffzhangandGitHub ad01818596 Merge pull request #11 from TomPallister/develop 
merge newest code
 2017-02-18 08:27:54 +08:00
geffzhangandGitHub 2fcf944d55 Merge pull request #10 from TomPallister/develop 
merge rate limit
 2017-02-15 18:28:04 +08:00
geffzhang f302ee77bf remove bak file 2017-02-15 08:54:20 +08:00
geffzhang ab6ae8a062 merge newest code for develop 2017-02-15 08:50:22 +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
geffzhangandGitHub c966227ea9 Merge pull request #9 from TomPallister/develop 
Merge Newest code
 2017-02-15 07:13:21 +08:00
geffzhang 2fa6e66dd4 refactor code 2017-02-13 08:29:29 +08:00
geffzhang 659d124780 reset sdk version 2017-02-12 15:50:21 +08:00
geffzhang e1f16c2be1 add ratelimit acceptance test 2017-02-12 15:49:21 +08:00
geffzhang 9b06afc781 refactor ratelimit config 2017-02-11 20:52:20 +08:00
geffzhang e1d5ef3aae implement Request Rate limit, this feature is options 2017-02-11 16:32:30 +08:00
geffzhang 08c9700a4a Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-02-10 23:19:17 +08:00
geffzhangandGitHub 9267918270 Merge pull request #7 from TomPallister/master 
Master
 2017-02-10 07:09:14 +08:00
geffzhangandGitHub bc5f284afa Merge pull request #6 from TomPallister/develop 
Merge  CircuitBreakerPattern
 2017-02-10 07:05:24 +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
geffzhangandGitHub 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
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
geffzhangandGitHub a895fdfc12 Merge branch 'develop' into CircuitBreakerPattern 2017-02-07 18:41:11 +08: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
geffzhangandGitHub 338d1c0c3c Merge pull request #5 from TomPallister/develop 
merge servicediscovery
 2017-02-07 07:26:37 +08:00
geffzhangandGitHub 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
geffzhang e80364a1f8 HttpClientHttpRequester implements the Circuit Breaker Pattern 
HttpClientHttpRequester implements the Circuit Breaker Pattern，I using
Polly from thepollyproject.org
 2017-02-02 23:35:02 +08:00
geffzhang 2ba91aeb5e Merge remote-tracking branch 'refs/remotes/TomPallister/develop' into develop 2017-02-02 23:00:16 +08:00
geffzhangandGitHub 86414c6917 Merge pull request #1 from TomPallister/develop 
mergecode
 2016-12-18 13:14:20 +08:00