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

#296 started writing merge code

Browse Source
This commit is contained in:
Tom Pallister
2018-04-14 07:02:17 +01:00
parent fe9bca7b77
commit 7ca828836a
4 changed files with 96 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Ocelot/Configuration/Creator/FileInternalConfigurationCreator.cs
View File

@ -18,7 +18,6 @@ namespace Ocelot.Configuration.Creator
/// </summary>
public class FileInternalConfigurationCreator : IInternalConfigurationCreator
{
private readonly IOptions<FileConfiguration> _options;
private readonly IConfigurationValidator _configurationValidator;
private readonly IOcelotLogger _logger;
private readonly IClaimsToThingCreator _claimsToThingCreator;
@ -36,7 +35,6 @@ namespace Ocelot.Configuration.Creator
private readonly IDownstreamAddressesCreator _downstreamAddressesCreator;
public FileInternalConfigurationCreator(
IOptions<FileConfiguration> options,
IConfigurationValidator configurationValidator,
IOcelotLoggerFactory loggerFactory,
IClaimsToThingCreator claimsToThingCreator,
@ -62,7 +60,6 @@ namespace Ocelot.Configuration.Creator
_requestIdKeyCreator = requestIdKeyCreator;
_upstreamTemplatePatternCreator = upstreamTemplatePatternCreator;
_authOptionsCreator = authOptionsCreator;
_options = options;
_configurationValidator = configurationValidator;
_logger = loggerFactory.CreateLogger<FileInternalConfigurationCreator>();
_claimsToThingCreator = claimsToThingCreator;

9
src/Ocelot/DependencyInjection/ConfigurationBuilderExtensions.cs
View File

@ -18,5 +18,14 @@ namespace Ocelot.DependencyInjection
builder.Add(memorySource);
return builder;
}
public static IConfigurationBuilder AddOcelot(this IConfigurationBuilder builder)
{
//var load all files with ocelot*.json
//merge these files into one
//save it as ocelot.json
builder.AddJsonFile("ocelot.json");
return builder;
}
}
}