Merge pull request #136 from MV10/issue_63

fixes #63 - option to control assembly source

Author: nblumhardt

src/Serilog.Settings.Configuration/ConfigurationLoggerConfigurationExtensions.cs

@@ -47,6 +47,7 @@ public static LoggerConfiguration Configuration(
             DependencyContext dependencyContext = null)
         {
             if (configuration == null) throw new ArgumentNullException(nameof(configuration));
+
             return settingConfiguration.Settings(
                 new ConfigurationReader(
                     configuration,
@@ -69,11 +70,63 @@ public static LoggerConfiguration ConfigurationSection(
         {
             if (settingConfiguration == null) throw new ArgumentNullException(nameof(settingConfiguration));
             if (configSection == null) throw new ArgumentNullException(nameof(configSection));
-            
+
             return settingConfiguration.Settings(
                 new ConfigurationReader(
                     configSection,
                     dependencyContext ?? (Assembly.GetEntryAssembly() != null ? DependencyContext.Default : null)));
         }
+
+        /// <summary>
+        /// Reads logger settings from the provided configuration object using the default section name. Generally this
+        /// is preferable over the other method that takes a configuration section. Only this version will populate
+        /// IConfiguration parameters on target methods.
+        /// </summary>
+        /// <param name="settingConfiguration">Logger setting configuration.</param>
+        /// <param name="configuration">A configuration object which contains a Serilog section.</param>
+        /// <param name="configurationAssemblySource">Defines how the package identifies assemblies to scan for sinks and other Types.</param>
+        /// <returns>An object allowing configuration to continue.</returns>
+        public static LoggerConfiguration Configuration(
+            this LoggerSettingsConfiguration settingConfiguration,
+            IConfiguration configuration,
+            ConfigurationAssemblySource configurationAssemblySource)
+        {
+            if (configuration == null) throw new ArgumentNullException(nameof(configuration));
+
+            if(configurationAssemblySource == ConfigurationAssemblySource.UseLoadedAssemblies)
+            {
+                return Configuration(settingConfiguration, configuration);
+            }
+            else
+            {
+                return settingConfiguration.Settings(new ConfigurationReader(configuration, null));
+            }
+        }
+
+        /// <summary>
+        /// Reads logger settings from the provided configuration section. Generally it is preferable to use the other
+        /// extension method that takes the full configuration object.
+        /// </summary>
+        /// <param name="settingConfiguration">Logger setting configuration.</param>
+        /// <param name="configSection">The Serilog configuration section</param>
+        /// <param name="configurationAssemblySource">Defines how the package identifies assemblies to scan for sinks and other Types.</param>
+        /// <returns>An object allowing configuration to continue.</returns>
+        public static LoggerConfiguration ConfigurationSection(
+            this LoggerSettingsConfiguration settingConfiguration,
+            IConfigurationSection configSection,
+            ConfigurationAssemblySource configurationAssemblySource)
+        {
+            if (settingConfiguration == null) throw new ArgumentNullException(nameof(settingConfiguration));
+            if (configSection == null) throw new ArgumentNullException(nameof(configSection));
+
+            if (configurationAssemblySource == ConfigurationAssemblySource.UseLoadedAssemblies)
+            {
+                return Configuration(settingConfiguration, configSection);
+            }
+            else
+            {
+                return settingConfiguration.Settings(new ConfigurationReader(configSection, null));
+            }
+        }
     }
 }

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationAssemblySource.cs

@@ -0,0 +1,32 @@
+// Copyright 2013-2016 Serilog Contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Serilog.Settings.Configuration
+{
+    /// <summary>
+    /// Defines how the package will identify the assemblies which are scanned for sinks and other Type information.
+    /// </summary>
+    public enum ConfigurationAssemblySource
+    {
+        /// <summary>
+        /// Try to scan the assemblies already in memory. This is the default. If GetEntryAssembly is null, fallback to DLL scanning.
+        /// </summary>
+        UseLoadedAssemblies,
+
+        /// <summary>
+        /// Scan for assemblies in DLLs from the working directory. This is the fallback when GetEntryAssembly is null.
+        /// </summary>
+        AlwaysScanDllFiles
+    }
+}

test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs

@@ -77,6 +77,31 @@ public void ParameterlessSinksAreConfigured(string syntax, string json)
             Assert.Equal(1, DummyWithLevelSwitchSink.Emitted.Count);
         }
 
+        [Fact]
+        public void ConfigurationAssembliesFromDllScanning()
+        {
+            var json = @"{
+                ""Serilog"": {            
+                    ""Using"": [""TestDummies""],
+                    ""WriteTo"": [""DummyConsole""]
+                }
+            }";
+
+            var builder = new ConfigurationBuilder().AddJsonString(json);
+            var config = builder.Build();
+            var log = new LoggerConfiguration()
+                .ReadFrom.Configuration(
+                    configuration: config,
+                    configurationAssemblySource: ConfigurationAssemblySource.AlwaysScanDllFiles)
+                .CreateLogger();
+
+            DummyConsoleSink.Emitted.Clear();
+
+            log.Write(Some.InformationEvent());
+
+            Assert.Equal(1, DummyConsoleSink.Emitted.Count);
+        }
+
         [Fact]
         public void SinksAreConfigured()
         {

test/Serilog.Settings.Configuration.Tests/LoggerConfigurationExtensionsTests.cs

@@ -1,5 +1,5 @@
-using Microsoft.Extensions.Configuration;
-using System;
+using System;
+using Microsoft.Extensions.Configuration;
 using Xunit;
 
 namespace Serilog.Settings.Configuration.Tests