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

started messing around with admin area

Browse Source
This commit is contained in:
Tom Gardham-Pallister
2017-02-13 12:13:53 +00:00
parent 0b830d9891
commit 95fc687e93
9 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
View File

@@ -85,7 +85,7 @@ namespace Ocelot.Configuration.Creator
reRoutes.Add(ocelotReRoute);
}
return new OcelotConfiguration(reRoutes);
return new OcelotConfiguration(reRoutes, _options.Value.GlobalConfiguration.AdministrationPath);
}
private async Task<ReRoute> SetUpReRoute(FileReRoute fileReRoute, FileGlobalConfiguration globalConfiguration)

1
src/Ocelot/Configuration/File/FileGlobalConfiguration.cs
View File

@@ -8,5 +8,6 @@
}
public string RequestIdKey { get; set; }
public FileServiceDiscoveryProvider ServiceDiscoveryProvider {get;set;}
public string AdministrationPath {get;set;}
}
}

1
src/Ocelot/Configuration/IOcelotConfiguration.cs
View File

@@ -5,5 +5,6 @@ namespace Ocelot.Configuration
public interface IOcelotConfiguration
{
List<ReRoute> ReRoutes { get; }
string AdministrationPath {get;}
}
}

4
src/Ocelot/Configuration/OcelotConfiguration.cs
View File

@@ -4,11 +4,13 @@ namespace Ocelot.Configuration
{
public class OcelotConfiguration : IOcelotConfiguration
{
public OcelotConfiguration(List<ReRoute> reRoutes)
public OcelotConfiguration(List<ReRoute> reRoutes, string administrationPath)
{
ReRoutes = reRoutes;
AdministrationPath = administrationPath;
}
public List<ReRoute> ReRoutes { get; }
public string AdministrationPath {get;}
}
}

16
src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs
View File

@@ -18,6 +18,7 @@ namespace Ocelot.Middleware
using System.Threading.Tasks;
using Authorisation.Middleware;
using Microsoft.AspNetCore.Http;
using Ocelot.Configuration;
using Ocelot.Configuration.Provider;
using Ocelot.LoadBalancer.Middleware;
@@ -30,9 +31,9 @@ namespace Ocelot.Middleware
/// <returns></returns>
public static IApplicationBuilder UseOcelot(this IApplicationBuilder builder)
{
CreateConfiguration(builder);
var configuration = CreateConfiguration(builder).Result;
builder.Map("/admin", x =>
builder.Map(configuration.AdministrationPath, x =>
{
x.UseMvc();
});
@@ -131,16 +132,19 @@ namespace Ocelot.Middleware
return builder;
}
private static void CreateConfiguration(IApplicationBuilder builder)
private static async Task<IOcelotConfiguration> CreateConfiguration(IApplicationBuilder builder)
{
var configProvider = (IOcelotConfigurationProvider)builder.ApplicationServices.GetService(typeof(IOcelotConfigurationProvider));
var config = configProvider.Get();
var config = await configProvider.Get();
if(config == null)
//todo move this to config validators
if(config == null || config.Data == null || config.IsError)
{
throw new Exception("Unable to start Ocelot: configuration was null");
throw new Exception("Unable to start Ocelot: configuration was invalid");
}
return config.Data;
}
private static void UseIfNotNull(this IApplicationBuilder builder, Func<HttpContext, Func<Task>, Task> middleware)