- added ReloadableConfigurationSource to Support types

- fixed failing test

Author: Sergey Komisarchik

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

@@ -1,48 +1,49 @@
-using System;
-using System.IO;
-using System.Threading;
-
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Json;
-
-using Serilog.Core;
+using Serilog.Core;
 using Serilog.Events;
 using Serilog.Settings.Configuration.Tests.Support;
 
 using Xunit;
+using Microsoft.Extensions.Configuration;
+
 using TestDummies.Console;
 
 namespace Serilog.Settings.Configuration.Tests
 {
-    public class DynamicLevelChangeTests : IDisposable
+    public class DynamicLevelChangeTests
     {
-        const string ConfigFilename = "dynamicLevels.json";
-
-        readonly IConfigurationRoot _config;
+        const string DefaultConfig = @"{
+            'Serilog': {
+                'Using': [ 'TestDummies' ],
+                'MinimumLevel': {
+                    'Default': 'Information',
+                    'Override': {
+                        'Root.Test': 'Information'
+                    }
+                },
+                'LevelSwitches': { '$mySwitch': 'Information' },
+                'WriteTo:Dummy': {
+                    'Name': 'DummyConsole',
+                    'Args': {
+                        'levelSwitch': '$mySwitch'
+                    }
+                }
+            }
+        }";
 
-        LogEventLevel _minimumLevel, _overrideLevel, _switchLevel;
+        readonly ReloadableConfigurationSource _configSource;
 
         public DynamicLevelChangeTests()
         {
-            UpdateConfig(LogEventLevel.Information, LogEventLevel.Information, LogEventLevel.Information);
-
-            _config = new ConfigurationBuilder()
-                .AddJsonFile(ConfigFilename, false, true)
-                .Build();
-        }
-
-        public void Dispose()
-        {
-            if (File.Exists(ConfigFilename))
-            {
-                File.Delete(ConfigFilename);
-            }
+            _configSource = new ReloadableConfigurationSource(JsonStringConfigSource.LoadData(DefaultConfig));
         }
 
         [Fact]
         public void ShouldRespectDynamicLevelChanges()
         {
-            using (var logger = new LoggerConfiguration().ReadFrom.Configuration(_config).CreateLogger())
+            using (var logger = new LoggerConfiguration()
+                .ReadFrom
+                .Configuration(new ConfigurationBuilder().Add(_configSource).Build())
+                .CreateLogger())
             {
                 DummyConsoleSink.Emitted.Clear();
                 logger.Write(Some.DebugEvent());
@@ -64,39 +65,25 @@ public void ShouldRespectDynamicLevelChanges()
                 logger.ForContext(Constants.SourceContextPropertyName, "Root.Test").Write(Some.DebugEvent());
                 Assert.Single(DummyConsoleSink.Emitted);
             }
-        }
 
-        void UpdateConfig(LogEventLevel? minimumLevel = null, LogEventLevel? overrideLevel = null, LogEventLevel? switchLevel = null)
-        {
-            File.WriteAllText(ConfigFilename, BuildConfiguration());
-            Thread.Sleep(300);
-
-            string BuildConfiguration()
+            void UpdateConfig(LogEventLevel? minimumLevel = null, LogEventLevel? switchLevel = null, LogEventLevel? overrideLevel = null)
             {
-                _minimumLevel = minimumLevel ?? _minimumLevel;
-                _overrideLevel = overrideLevel ?? _overrideLevel;
-                _switchLevel = switchLevel ?? _switchLevel;
-
-                var config = @"{
-                    'Serilog': {
-                        'Using': [ 'TestDummies' ],
-                        'MinimumLevel': {
-                            'Default': '" + _minimumLevel + @"',
-                            'Override': {
-                                'Root.Test': '" + _overrideLevel + @"'
-                            }
-                        },
-                        'LevelSwitches': { '$mySwitch': '" + _switchLevel + @"' },
-                        'WriteTo:Dummy': {
-                            'Name': 'DummyConsole',
-                            'Args': {
-                                'levelSwitch': '$mySwitch'
-                            }
-                        }
-                    }
-                }";
-
-                return config;
+                if (minimumLevel.HasValue)
+                {
+                    _configSource.Set("Serilog:MinimumLevel:Default", minimumLevel.Value.ToString());
+                }
+
+                if (switchLevel.HasValue)
+                {
+                    _configSource.Set("Serilog:LevelSwitches:$mySwitch", switchLevel.Value.ToString());
+                }
+
+                if (overrideLevel.HasValue)
+                {
+                    _configSource.Set("Serilog:MinimumLevel:Override:Root.Test", overrideLevel.Value.ToString());
+                }
+
+                _configSource.Reload();
             }
         }
     }

test/Serilog.Settings.Configuration.Tests/Support/JsonStringConfigSource.cs

@@ -1,8 +1,9 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Json;
-
+using System.Collections.Generic;
 using System.IO;
 
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Json;
+
 namespace Serilog.Settings.Configuration.Tests.Support
 {
     class JsonStringConfigSource : IConfigurationSource
@@ -24,6 +25,13 @@ public static IConfigurationSection LoadSection(string json, string section)
             return new ConfigurationBuilder().Add(new JsonStringConfigSource(json)).Build().GetSection(section);
         }
 
+        public static IDictionary<string, string> LoadData(string json)
+        {
+            var provider = new JsonStringConfigProvider(json);
+            provider.Load();
+            return provider.Data;
+        }
+
         class JsonStringConfigProvider : JsonConfigurationProvider
         {
             readonly string _json;
@@ -33,6 +41,8 @@ public JsonStringConfigProvider(string json) : base(new JsonConfigurationSource
                 _json = json;
             }
 
+            public new IDictionary<string, string> Data => base.Data;
+
             public override void Load()
             {
                 Load(StringToStream(_json));

test/Serilog.Settings.Configuration.Tests/Support/ReloadableConfigurationSource.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using Microsoft.Extensions.Configuration;
+
+namespace Serilog.Settings.Configuration.Tests.Support
+{
+    class ReloadableConfigurationSource : IConfigurationSource
+    {
+        readonly ReloadableConfigurationProvider _configProvider;
+        readonly IDictionary<string, string> _source;
+
+        public ReloadableConfigurationSource(IDictionary<string, string> source)
+        {
+            _source = source;
+            _configProvider = new ReloadableConfigurationProvider(source);
+        }
+
+        public IConfigurationProvider Build(IConfigurationBuilder builder) => _configProvider;
+
+        public void Reload() => _configProvider.Reload();
+
+        public void Set(string key, string value) => _source[key] = value;
+
+        class ReloadableConfigurationProvider : ConfigurationProvider
+        {
+            readonly IDictionary<string, string> _source;
+
+            public ReloadableConfigurationProvider(IDictionary<string, string> source)
+            {
+                _source = source;
+            }
+
+            public override void Load() => Data = _source;
+
+            public void Reload() => OnReload();
+        }
+    }
+}