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

Fix to AddOcelot(), Config File Merge (#970)

Browse Source 
* [develop]:
Added more functionality to configuration files as suggested by CesarD

* [develop]:
Clean up
This commit is contained in:
rjwester 2019-07-28 11:01:17 -04:00 committed by Thiago Loureiro
parent 76fdf2922a
commit ffecbed43a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,15 +40,13 @@ namespace Ocelot.DependencyInjection
const string globalConfigFile = "ocelot.global.json"; const string globalConfigFile = "ocelot.global.json";
const string subConfigPattern = @"^ocelot\.[a-zA-Z0-9]+\.json$"; string subConfigPattern = $@"^ocelot\.([a-zA-Z0-9]+|[a-zA-Z0-9]+\.{env?.EnvironmentName})\.json$";
string excludeConfigName = env?.EnvironmentName != null ? $"ocelot.{env.EnvironmentName}.json" : string.Empty;
var reg = new Regex(subConfigPattern, RegexOptions.IgnoreCase | RegexOptions.Singleline); var reg = new Regex(subConfigPattern, RegexOptions.IgnoreCase | RegexOptions.Singleline);
var files = new DirectoryInfo(folder) var files = new DirectoryInfo(folder)
.EnumerateFiles() .EnumerateFiles()
.Where(fi => reg.IsMatch(fi.Name) && (fi.Name != excludeConfigName)) .Where(fi => reg.IsMatch(fi.Name))
.ToList(); .ToList();
var fileConfiguration = new FileConfiguration(); var fileConfiguration = new FileConfiguration();