tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 07:18:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/develop' into RateLimit

Browse Source 
# 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
This commit is contained in:
geffzhang
2017-02-15 08:49:40 +08:00
parent 2fa6e66dd4 c966227ea9
commit 0aad1f8fa0
83 changed files with 1854 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/Ocelot.AcceptanceTests/ClientRateLimitTests.cs
View File

@ -46,7 +46,7 @@ namespace Ocelot.AcceptanceTests
DownstreamPort = 51879,
DownstreamScheme = "http",
DownstreamHost = "localhost",
UpstreamTemplate = "/api/ClientRateLimit",
UpstreamPathTemplate = "/api/ClientRateLimit",
UpstreamHttpMethod = "Get",
RequestIdKey = _steps.RequestIdKey,
@ -56,7 +56,7 @@ namespace Ocelot.AcceptanceTests
ClientWhitelist = new List<string>(),
Limit = 3,
Period = "1s",
PeriodTimespan = 100
PeriodTimespan = 1000
}
}
},
@ -101,7 +101,7 @@ namespace Ocelot.AcceptanceTests
DownstreamPort = 51879,
DownstreamScheme = "http",
DownstreamHost = "localhost",
UpstreamTemplate = "/api/ClientRateLimit",
UpstreamPathTemplate = "/api/ClientRateLimit",
UpstreamHttpMethod = "Get",
RequestIdKey = _steps.RequestIdKey,