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

Jump to bottom

Case-insensitive enum parsing for level overrides #388

Merged
merged 3 commits into from
Jul 5, 2023
Merged

Case-insensitive enum parsing for level overrides #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d410d53
Case-insensitive enum parsing for level overrides
sungam3r Jun 29, 2023
b66d978
SubscribeToLoggingLevelChanges
sungam3r Jul 5, 2023
ca95760
trigger ci
sungam3r Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 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 @@ -164,7 +164,7 @@ void ApplyMinimumLevel(LoggerConfiguration loggerConfiguration)
{
var overridePrefix = overrideDirective.Key;
var overridenLevelOrSwitch = overrideDirective.Value;
if (Enum.TryParse(overridenLevelOrSwitch, out LogEventLevel _))
if (Enum.TryParse(overridenLevelOrSwitch, ignoreCase: true, out LogEventLevel _))
{
ApplyMinimumLevelConfiguration(overrideDirective, (configuration, levelSwitch) =>
{
Expand Down Expand Up @@ -221,7 +221,7 @@ void SubscribeToLoggingLevelChanges(IConfigurationSection levelSection, LoggingL
levelSection.GetReloadToken,
() =>
{
if (Enum.TryParse(levelSection.Value, out LogEventLevel minimumLevel))
if (Enum.TryParse(levelSection.Value, ignoreCase: true, out LogEventLevel minimumLevel))
levelSwitch.MinimumLevel = minimumLevel;
else
SelfLog.WriteLine($"The value {levelSection.Value} is not a valid Serilog level.");
Expand Down Expand Up @@ -591,9 +591,7 @@ internal static bool IsValidSwitchName(string input)
}

static LogEventLevel ParseLogEventLevel(string value)
{
if (!Enum.TryParse(value, ignoreCase: true, out LogEventLevel parsedLevel))
throw new InvalidOperationException($"The value {value} is not a valid Serilog level.");
return parsedLevel;
}
=> Enum.TryParse(value, ignoreCase: true, out LogEventLevel parsedLevel)
? parsedLevel
: throw new InvalidOperationException($"The value {value} is not a valid Serilog level.");
}
2 changes: 1 addition & 1 deletion src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class StringArgumentValue : IConfigurationArgumentValue
{
readonly string _providedValue;

static readonly Regex StaticMemberAccessorRegex = new Regex("^(?<shortTypeName>[^:]+)::(?<memberName>[A-Za-z][A-Za-z0-9]*)(?<typeNameExtraQualifiers>[^:]*)$");
static readonly Regex StaticMemberAccessorRegex = new("^(?<shortTypeName>[^:]+)::(?<memberName>[A-Za-z][A-Za-z0-9]*)(?<typeNameExtraQualifiers>[^:]*)$");

public StringArgumentValue(string providedValue)
{
Expand Down