Load all dlls when no includeDlls are configured

proepkes · Nov 2, 2018 · c712ab0 · c712ab0
1 parent caa18a2
commit c712ab0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/SpeedDate/Configuration/FileConfigProvider.cs b/SpeedDate/Configuration/FileConfigProvider.cs
@@ -42,7 +42,6 @@ public FileConfigProvider(string configFile)
             });
         }
 
-
         public void Configure(IEnumerable<IConfig> configInstances)
         {
             var configuration = File.ReadAllText(_configFile);

diff --git a/SpeedDate/SpeedDateKernel.cs b/SpeedDate/SpeedDateKernel.cs
@@ -95,15 +95,21 @@ private TinyIoCContainer CreateContainer(ISpeedDateStartable startable)
                     ioc.Register((container, overloads, requesttype) => (IClient) startable);
                     break;
             }
-
-            //Register configs & plugins
-            foreach (var dllFile in
-                Directory.GetFiles(
-                    Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ??
-                    throw new InvalidOperationException(), "*.dll").Where(
+
+            var allFiles = Directory.GetFiles(
+                Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ??
+                throw new InvalidOperationException(), "*.dll");
+
+            if (_config.Plugins.IncludeDlls.Length > 0)
+            {
+                allFiles = allFiles.Where(
                         file => _config.Plugins.IncludeDlls.Split(';').Any(includeDll =>
-                            Regex.IsMatch(Path.GetFileNameWithoutExtension(file), includeDll.Trim().AsRegular()))
-                ))
+                            Regex.IsMatch(Path.GetFileNameWithoutExtension(file), includeDll.Trim().AsRegular())))
+                    .ToArray();
+            }
+
+            //Register configs & plugins
+            foreach (var dllFile in allFiles)
             {
                 _logger.Info($"Loading dll: {dllFile}");
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,6 @@ public FileConfigProvider(string configFile) @@
                 });
             }
             public void Configure(IEnumerable<IConfig> configInstances)
             {
                 var configuration = File.ReadAllText(_configFile);
@@ Expand Down @@