tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 03:18:15 +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
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
{
using System.Net;
public class ProxyMiddleware
{
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);

16
src/Ocelot/Startup.cs
View File

@ -8,6 +8,11 @@ using Ocelot.Library.Middleware;
namespace Ocelot
{
using Library.Infrastructure.HostUrlRepository;
using Library.Infrastructure.UrlPathMatcher;
using Library.Infrastructure.UrlPathReplacer;
using Library.Infrastructure.UrlPathTemplateRepository;
public class Startup
{
public Startup(IHostingEnvironment env)
@ -26,7 +31,11 @@ namespace Ocelot
public void ConfigureServices(IServiceCollection 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.
@ -37,11 +46,6 @@ namespace Ocelot
loggerFactory.AddDebug();
app.UseProxy();
//app.Run()
// app.Run(async context =>
// {
// await context.Response.WriteAsync("Hello from Tom");
// });
}
}
}