Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefer "MinimumLevel:Default" value if "MinimumLevel" value returns empty string #413

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Prefer "MinimumLevel:Default" value if "MinimumLevel" value returns empty string #413

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
464871c
Use value from `Serilog:MinimumLevel:Default` if value from `Serilog:…
Mar 15, 2024
1d62cc4
Update test/Serilog.Settings.Configuration.Tests/LoggerConfigurationE…
DavidAllardyce Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@ void ApplyMinimumLevelConfiguration(IConfigurationSection directive, Action<Logg
{
foreach (var provider in _configurationRoot.Providers.Reverse())
{
if (provider.TryGet(minimumLevelDirective.Path, out _))
if (provider.TryGet(minimumLevelDirective.Path, out var minValue) && !string.IsNullOrEmpty(minValue))
{
return _configurationRoot.GetSection(minimumLevelDirective.Path);
}

if (provider.TryGet(defaultLevelDirective.Path, out _))
if (provider.TryGet(defaultLevelDirective.Path, out var defaultValue) && !string.IsNullOrEmpty(defaultValue))
{
return _configurationRoot.GetSection(defaultLevelDirective.Path);
}
Expand Down
19 changes: 19 additions & 0 deletions test/Serilog.Settings.Configuration.Tests/LoggerConfigurationExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,23 @@ public void ReadFromConfigurationSectionDoesNotThrowWhenTryingToCallConfiguratio
.CreateLogger();

}

[Fact]
[Trait("BugFix", "https://github.com/serilog/serilog-settings-configuration/issues/332")]
public void ReadFromConfigurationThrowsWhenMinimumLevelDefaultSetButMinimumLevelValueIsEmptyString()
DavidAllardyce marked this conversation as resolved.
Show resolved Hide resolved
{
var configuration = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string?>
{
["Serilog"] = "",
["Serilog:MinimumLevel"] = "",
["Serilog:MinimumLevel:Default"] = "Information",

})
.Build();

new LoggerConfiguration()
.ReadFrom.Configuration(configuration)
.CreateLogger();
}
}