From 1e88062ce2dc523f635791234110e599736cc8e9 Mon Sep 17 00:00:00 2001 From: Tom Gardham-Pallister Date: Wed, 15 Feb 2017 07:43:50 +0000 Subject: [PATCH] moved create admin area call --- .../Middleware/OcelotMiddlewareExtensions.cs | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs b/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs index 26b1638f..269d646d 100644 --- a/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs +++ b/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs @@ -31,26 +31,11 @@ namespace Ocelot.Middleware /// public static async Task UseOcelot(this IApplicationBuilder builder) { - await CreateAdministrationArea(builder); - await builder.UseOcelot(new OcelotMiddlewareConfiguration()); return builder; } - private static async Task CreateAdministrationArea(IApplicationBuilder builder) - { - var configuration = await CreateConfiguration(builder); - - if(!string.IsNullOrEmpty(configuration.AdministrationPath)) - { - builder.Map(configuration.AdministrationPath, x => - { - x.UseMvc(); - }); - } - } - /// /// Registers Ocelot with a combination of default middlewares and optional middlewares in the configuration /// @@ -153,6 +138,19 @@ namespace Ocelot.Middleware return config.Data; } + private static async Task CreateAdministrationArea(IApplicationBuilder builder) + { + var configuration = await CreateConfiguration(builder); + + if(!string.IsNullOrEmpty(configuration.AdministrationPath)) + { + builder.Map(configuration.AdministrationPath, x => + { + x.UseMvc(); + }); + } + } + private static void UseIfNotNull(this IApplicationBuilder builder, Func, Task> middleware) { if (middleware != null)