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

Merge remote-tracking branch 'upstream/develop' into feature/AddStyleCopAnalyzers

Browse Source 
# Conflicts:
#	test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
#	test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
This commit is contained in:
Philip Wood
2018-03-03 12:33:04 +00:00
parent 9f458a878b 9cb25ab063
commit 28a41b21a4
161 changed files with 4612 additions and 2073 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/Ocelot.ManualTest/Program.cs
View File

@ -25,25 +25,24 @@ namespace Ocelot.ManualTest
.AddEnvironmentVariables();
})
.ConfigureServices(s => {
s.AddAuthentication()
s.AddAuthentication()
.AddJwtBearer("TestKey", x =>
{
x.Authority = "test";
x.Audience = "test";
});
s.AddOcelot()
.AddCacheManager(x =>
{
x.WithDictionaryHandle();
})
.AddOpenTracing(option =>
{
option.CollectorUrl = "http://localhost:9618";
option.Service = "Ocelot.ManualTest";
})
.AddAdministration("/administration", "secret");
s.AddOcelot()
.AddCacheManager(x =>
{
x.WithDictionaryHandle();
})
.AddOpenTracing(option =>
{
option.CollectorUrl = "http://localhost:9618";
option.Service = "Ocelot.ManualTest";
})
.AddAdministration("/administration", "secret");
})
.ConfigureLogging((hostingContext, logging) =>
{

6
test/Ocelot.ManualTest/configuration.json
View File

@ -8,7 +8,7 @@
"DownstreamHostAndPorts": [
{
"Host": "localhost",
"Port": 5001
"Port": 5007
}
],
"HttpHandlerOptions": {
@ -99,7 +99,7 @@
"HttpHandlerOptions": {
"AllowAutoRedirect": true,
"UseCookieContainer": true,
"UseTracing": true
"UseTracing": false
},
"QoSOptions": {
"ExceptionsAllowedBeforeBreaking": 3,
@ -121,7 +121,7 @@
"HttpHandlerOptions": {
"AllowAutoRedirect": true,
"UseCookieContainer": true,
"UseTracing": true
"UseTracing": false
},
"QoSOptions": {
"ExceptionsAllowedBeforeBreaking": 3,