tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-22 09:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

merged develop

Browse Source
This commit is contained in:
Tom Gardham-Pallister 2016-08-19 20:20:10 +01:00
parent 0421dba1e2
commit c41dd950e0
6 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Ocelot.Library/Middleware/ProxyMiddleware.cs
View File

@ -8,6 +8,8 @@ using Ocelot.Library.Infrastructure.UrlPathTemplateRepository;
namespace Ocelot.Library.Middleware namespace Ocelot.Library.Middleware
{ {
using System.Net;
public class ProxyMiddleware public class ProxyMiddleware
{ {
private readonly RequestDelegate _next; private readonly RequestDelegate _next;
@ -49,9 +51,10 @@ namespace Ocelot.Library.Middleware
} }
} }
if (!urlPathMatch.Match) if (urlPathMatch == null || !urlPathMatch.Match)
{ {
throw new Exception("BOOOM TING! no match"); context.Response.StatusCode = (int)HttpStatusCode.NotFound;
return;
} }
var upstreamHostUrl = _hostUrlRepository.GetBaseUrlMap(urlPathMatch.DownstreamUrlPathTemplate); var upstreamHostUrl = _hostUrlRepository.GetBaseUrlMap(urlPathMatch.DownstreamUrlPathTemplate);

16
src/Ocelot/Startup.cs
View File

@ -8,6 +8,11 @@ using Ocelot.Library.Middleware;
namespace Ocelot namespace Ocelot
{ {
using Library.Infrastructure.HostUrlRepository;
using Library.Infrastructure.UrlPathMatcher;
using Library.Infrastructure.UrlPathReplacer;
using Library.Infrastructure.UrlPathTemplateRepository;
public class Startup public class Startup
{ {
public Startup(IHostingEnvironment env) public Startup(IHostingEnvironment env)
@ -26,7 +31,11 @@ namespace Ocelot
public void ConfigureServices(IServiceCollection services) public void ConfigureServices(IServiceCollection services)
{ {
// Add framework services. // Add framework services.
services.AddSingleton<IHostUrlMapRepository, InMemoryHostUrlMapRepository>();
services.AddSingleton<IUrlPathToUrlPathTemplateMatcher, UrlPathToUrlPathTemplateMatcher>();
services.AddSingleton<IHostUrlMapRepository, InMemoryHostUrlMapRepository>();
services.AddSingleton<IUpstreamUrlPathTemplateVariableReplacer, UpstreamUrlPathTemplateVariableReplacer>();
services.AddSingleton<IUrlPathTemplateMapRepository, InMemoryUrlPathTemplateMapRepository>();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@ -37,11 +46,6 @@ namespace Ocelot
loggerFactory.AddDebug(); loggerFactory.AddDebug();
app.UseProxy(); app.UseProxy();
//app.Run()
// app.Run(async context =>
// {
// await context.Response.WriteAsync("Hello from Tom");
// });
} }
} }
} }

32
test/Ocelot.AcceptanceTests/RouterTests.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.TestHost;
using Xunit; using Xunit;
@ -9,41 +8,40 @@ using Shouldly;
namespace Ocelot.AcceptanceTests namespace Ocelot.AcceptanceTests
{ {
using System.Net;
public class RouterTests : IDisposable public class RouterTests : IDisposable
{ {
private FakeService _fakeService; private readonly FakeService _fakeService;
private readonly TestServer _server; private readonly TestServer _server;
private readonly HttpClient _client; private readonly HttpClient _client;
private HttpResponseMessage _response;
public RouterTests() public RouterTests()
{ {
_server = new TestServer(new WebHostBuilder() _server = new TestServer(new WebHostBuilder()
.UseStartup<Startup>()); .UseStartup<Startup>());
_client = _server.CreateClient(); _client = _server.CreateClient();
_fakeService = new FakeService(); _fakeService = new FakeService();
} }
[Fact] [Fact]
public void hello_world() public void should_return_response_404()
{ {
var response = _client.GetAsync("/").Result; WhenIRequestTheUrl("/");
response.EnsureSuccessStatusCode(); ThenTheStatusCodeShouldBe(HttpStatusCode.NotFound);
var responseString = response.Content.ReadAsStringAsync().Result;
responseString.ShouldBe("Hello from Tom");
} }
[Fact] private void WhenIRequestTheUrl(string url)
public async Task can_route_request()
{ {
_fakeService.Start("http://localhost:5001"); _response = _client.GetAsync("/").Result;
}
// Act private void ThenTheStatusCodeShouldBe(HttpStatusCode expectedHttpStatusCode)
var response = await _client.GetAsync("/"); {
response.EnsureSuccessStatusCode(); _response.StatusCode.ShouldBe(expectedHttpStatusCode);
var responseString = await response.Content.ReadAsStringAsync();
responseString.ShouldBe("Hello from Laura");
} }
public void Dispose() public void Dispose()

8
test/Ocelot.Benchmarks/BenchmarkDotNet.Artifacts/results/UrlPathToUrlPathTemplateMatcherBenchmarks-report-github.md
View File

@ -14,7 +14,7 @@ Type=UrlPathToUrlPathTemplateMatcherBenchmarks Mode=Throughput Toolchain=Core
GarbageCollection=Concurrent Workstation GarbageCollection=Concurrent Workstation
``` ```
Method | Median | StdDev | Mean | StdError | StdDev | Op/s | Min | Q1 | Median | Q3 | Max | Method | Median | StdDev | Mean | StdError | StdDev | Op/s | Min | Q1 | Median | Q3 | Max |
----------- |------------ |---------- |------------ |---------- |---------- |----------- |------------ |------------ |------------ |------------ |------------ | ----------- |------------ |----------- |------------ |---------- |----------- |----------- |------------ |------------ |------------ |------------ |------------ |
Benchmark1 | 180.4251 ns | 4.1294 ns | 180.4400 ns | 0.9234 ns | 4.1294 ns | 5542007.02 | 174.5503 ns | 177.6286 ns | 180.4251 ns | 182.5334 ns | 190.9792 ns | Benchmark1 | 184.4215 ns | 5.1537 ns | 185.3322 ns | 1.1524 ns | 5.1537 ns | 5395716.74 | 178.2386 ns | 181.8117 ns | 184.4215 ns | 188.2762 ns | 196.7310 ns |
Benchmark2 | 178.7267 ns | 6.1670 ns | 180.6081 ns | 1.3148 ns | 6.1670 ns | 5536849.8 | 174.0821 ns | 177.0992 ns | 178.7267 ns | 182.1962 ns | 198.1308 ns | Benchmark2 | 186.1899 ns | 35.7006 ns | 202.4315 ns | 3.9425 ns | 35.7006 ns | 4939943.34 | 176.9750 ns | 182.9672 ns | 186.1899 ns | 205.8946 ns | 369.0701 ns |

4
test/Ocelot.Benchmarks/BenchmarkDotNet.Artifacts/results/UrlPathToUrlPathTemplateMatcherBenchmarks-report.csv
View File

@ -1,3 +1,3 @@
Type;Method;Mode;Platform;Jit;Toolchain;Runtime;GarbageCollection;LaunchCount;WarmupCount;TargetCount;Affinity;Median;StdDev;Mean;StdError;StdDev;Op/s;Min;Q1;Median;Q3;Max Type;Method;Mode;Platform;Jit;Toolchain;Runtime;GarbageCollection;LaunchCount;WarmupCount;TargetCount;Affinity;Median;StdDev;Mean;StdError;StdDev;Op/s;Min;Q1;Median;Q3;Max
UrlPathToUrlPathTemplateMatcherBenchmarks;Benchmark1;Throughput;Host;Host;Core;Host;Concurrent Workstation;Auto;Auto;Auto;Auto;180.4251 ns;4.1294 ns;180.4400 ns;0.9234 ns;4.1294 ns;5542007.02;174.5503 ns;177.6286 ns;180.4251 ns;182.5334 ns;190.9792 ns UrlPathToUrlPathTemplateMatcherBenchmarks;Benchmark1;Throughput;Host;Host;Core;Host;Concurrent Workstation;Auto;Auto;Auto;Auto;184.4215 ns;5.1537 ns;185.3322 ns;1.1524 ns;5.1537 ns;5395716.74;178.2386 ns;181.8117 ns;184.4215 ns;188.2762 ns;196.7310 ns
UrlPathToUrlPathTemplateMatcherBenchmarks;Benchmark2;Throughput;Host;Host;Core;Host;Concurrent Workstation;Auto;Auto;Auto;Auto;178.7267 ns;6.1670 ns;180.6081 ns;1.3148 ns;6.1670 ns;5536849.8;174.0821 ns;177.0992 ns;178.7267 ns;182.1962 ns;198.1308 ns UrlPathToUrlPathTemplateMatcherBenchmarks;Benchmark2;Throughput;Host;Host;Core;Host;Concurrent Workstation;Auto;Auto;Auto;Auto;186.1899 ns;35.7006 ns;202.4315 ns;3.9425 ns;35.7006 ns;4939943.34;176.9750 ns;182.9672 ns;186.1899 ns;205.8946 ns;369.0701 ns

1 Type Method Mode Platform Jit Toolchain Runtime GarbageCollection LaunchCount WarmupCount TargetCount Affinity Median StdDev Mean StdError StdDev Op/s Min Q1 Median Q3 Max
2 UrlPathToUrlPathTemplateMatcherBenchmarks Benchmark1 Throughput Host Host Core Host Concurrent Workstation Auto Auto Auto Auto 180.4251 ns 184.4215 ns 4.1294 ns 5.1537 ns 180.4400 ns 185.3322 ns 0.9234 ns 1.1524 ns 4.1294 ns 5.1537 ns 5542007.02 5395716.74 174.5503 ns 178.2386 ns 177.6286 ns 181.8117 ns 180.4251 ns 184.4215 ns 182.5334 ns 188.2762 ns 190.9792 ns 196.7310 ns
3 UrlPathToUrlPathTemplateMatcherBenchmarks Benchmark2 Throughput Host Host Core Host Concurrent Workstation Auto Auto Auto Auto 178.7267 ns 186.1899 ns 6.1670 ns 35.7006 ns 180.6081 ns 202.4315 ns 1.3148 ns 3.9425 ns 6.1670 ns 35.7006 ns 5536849.8 4939943.34 174.0821 ns 176.9750 ns 177.0992 ns 182.9672 ns 178.7267 ns 186.1899 ns 182.1962 ns 205.8946 ns 198.1308 ns 369.0701 ns

4
test/Ocelot.Benchmarks/BenchmarkDotNet.Artifacts/results/UrlPathToUrlPathTemplateMatcherBenchmarks-report.html
View File

@ -15,6 +15,6 @@ GarbageCollection=Concurrent Workstation
<table> <table>
<tr><th>Method</th><th>Median</th><th>StdDev</th><th> Mean</th><th>StdError</th><th>StdDev</th><th>Op/s</th><th> Min</th><th> Q1</th><th>Median</th><th> Q3</th><th> Max</th> <tr><th>Method</th><th>Median</th><th>StdDev</th><th> Mean</th><th>StdError</th><th>StdDev</th><th>Op/s</th><th> Min</th><th> Q1</th><th>Median</th><th> Q3</th><th> Max</th>
</tr><tr><td>Benchmark1</td><td>180.4251 ns</td><td>4.1294 ns</td><td>180.4400 ns</td><td>0.9234 ns</td><td>4.1294 ns</td><td>5542007.02</td><td>174.5503 ns</td><td>177.6286 ns</td><td>180.4251 ns</td><td>182.5334 ns</td><td>190.9792 ns</td> </tr><tr><td>Benchmark1</td><td>184.4215 ns</td><td>5.1537 ns</td><td>185.3322 ns</td><td>1.1524 ns</td><td>5.1537 ns</td><td>5395716.74</td><td>178.2386 ns</td><td>181.8117 ns</td><td>184.4215 ns</td><td>188.2762 ns</td><td>196.7310 ns</td>
</tr><tr><td>Benchmark2</td><td>178.7267 ns</td><td>6.1670 ns</td><td>180.6081 ns</td><td>1.3148 ns</td><td>6.1670 ns</td><td>5536849.8</td><td>174.0821 ns</td><td>177.0992 ns</td><td>178.7267 ns</td><td>182.1962 ns</td><td>198.1308 ns</td> </tr><tr><td>Benchmark2</td><td>186.1899 ns</td><td>35.7006 ns</td><td>202.4315 ns</td><td>3.9425 ns</td><td>35.7006 ns</td><td>4939943.34</td><td>176.9750 ns</td><td>182.9672 ns</td><td>186.1899 ns</td><td>205.8946 ns</td><td>369.0701 ns</td>
</tr></table> </tr></table>