Merge pull request #14 from skomis-mm/serilog-dev

Support for `MinimumLevel.Overide()`

Author: nblumhardt

sample/Sample/Program.cs

@@ -4,6 +4,8 @@
 using Serilog;
 using System.IO;
 
+using Serilog.Core;
+
 namespace Sample
 {
     public class Program
@@ -21,7 +23,11 @@ public static void Main(string[] args)
 
             do
             {
-                logger.Information("Hello, world!");
+                logger.ForContext<Program>().Information("Hello, world!");
+                logger.ForContext(Constants.SourceContextPropertyName, "Microsoft").Warning("Hello, world!");
+                logger.ForContext(Constants.SourceContextPropertyName, "MyApp.Something.Tricky").Verbose("Hello, world!");
+
+                Console.WriteLine();
             }
             while (Console.ReadKey().KeyChar != 'q');
         }

sample/Sample/appsettings.json

@@ -1,9 +1,20 @@
 {
   "Serilog": {
     "Using":  ["Serilog.Sinks.Literate"],
-    "MinimumLevel": "Debug",
+    "MinimumLevel": {
+      "Default": "Debug",
+      "Override": {
+        "Microsoft": "Warning",
+        "MyApp.Something.Tricky": "Verbose"
+      }
+    },
     "WriteTo": [
-      { "Name": "LiterateConsole" },
+      {
+        "Name": "LiterateConsole",
+        "Args": {
+          "outputTemplate": "[{Timestamp:HH:mm:ss} {SourceContext} [{Level}] {Message}{NewLine}{Exception}"
+        } 
+      },
       {        
         "Name": "File",
         "Args": {

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs

@@ -80,8 +80,8 @@ Dictionary<string, Dictionary<string, string>> GetMethodCalls(IConfigurationSect
                 else
                 {
                     var name = child.GetSection("Name");
-                    if (name == null)
-                        throw new InvalidOperationException("The configuration value in Serilog.WriteTo has no Name element.");
+                    if (name.Value == null)
+                        throw new InvalidOperationException($"The configuration value in {name.Path} has no Name element.");
 
                     var callArgs = new Dictionary<string, string>();
                     var args = child.GetSection("Args");
@@ -100,25 +100,39 @@ Dictionary<string, Dictionary<string, string>> GetMethodCalls(IConfigurationSect
 
         void ApplyMinimumLevel(LoggerConfiguration loggerConfiguration)
         {
+            var applyMinimumLevelAction =
+                new Action<IConfigurationSection, Action<LoggerMinimumLevelConfiguration, LoggingLevelSwitch>>(
+                    (directive, applyConfigAction) =>
+                    {
+                        LogEventLevel minimumLevel;
+                        if (!Enum.TryParse(directive.Value, out minimumLevel))
+                            throw new InvalidOperationException($"The value {directive.Value} is not a valid Serilog level.");
+
+                        var levelSwitch = new LoggingLevelSwitch(minimumLevel);
+                        applyConfigAction(loggerConfiguration.MinimumLevel, levelSwitch);
+
+                        ChangeToken.OnChange(
+                            directive.GetReloadToken,
+                            () =>
+                            {
+                                if (Enum.TryParse(directive.Value, out minimumLevel))
+                                    levelSwitch.MinimumLevel = minimumLevel;
+                                else
+                                    SelfLog.WriteLine($"The value {directive.Value} is not a valid Serilog level.");
+                            });
+                    });
+
             var minimumLevelDirective = _configuration.GetSection("MinimumLevel");
-            if (minimumLevelDirective?.Value != null)
-            {
-                LogEventLevel minimumLevel;
-                if (!Enum.TryParse(minimumLevelDirective.Value, out minimumLevel))
-                    throw new InvalidOperationException($"The value {minimumLevelDirective.Value} is not a valid Serilog level.");
 
-                var levelSwitch = new LoggingLevelSwitch(minimumLevel);
-                loggerConfiguration.MinimumLevel.ControlledBy(levelSwitch);
+            var defaultMinLevelDirective = minimumLevelDirective.Value != null ? minimumLevelDirective : minimumLevelDirective.GetSection("Default");
+            if (defaultMinLevelDirective.Value != null)
+            {
+                applyMinimumLevelAction(defaultMinLevelDirective, (configuration, levelSwitch) => configuration.ControlledBy(levelSwitch));
+            }
 
-                ChangeToken.OnChange(
-                    () => minimumLevelDirective.GetReloadToken(),
-                    () =>
-                    {
-                        if (Enum.TryParse(minimumLevelDirective.Value, out minimumLevel))
-                            levelSwitch.MinimumLevel = minimumLevel;
-                        else
-                            SelfLog.WriteLine($"The value {minimumLevelDirective.Value} is not a valid Serilog level.");
-                    });
+            foreach (var overrideDirective in minimumLevelDirective.GetSection("Override").GetChildren())
+            {
+                applyMinimumLevelAction(overrideDirective, (configuration, levelSwitch) => configuration.Override(overrideDirective.Key, levelSwitch));
             }
         }