From ffecbed43a33d65280a8ce90f98819a5ca24473d Mon Sep 17 00:00:00 2001
From: rjwester <russwesteren@gmail.com>
Date: Sun, 28 Jul 2019 11:01:17 -0400
Subject: [PATCH] Fix to AddOcelot(), Config File Merge (#970)

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

* [develop]:
Clean up
---
 .../DependencyInjection/ConfigurationBuilderExtensions.cs   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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