Skip to content

Commit 2c62e41

Browse files
authored
Merge pull request #388 from sungam3r/case
Case-insensitive enum parsing for level overrides
2 parents d7e0dbd + ca95760 commit 2c62e41

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void ApplyMinimumLevel(LoggerConfiguration loggerConfiguration)
164164
{
165165
var overridePrefix = overrideDirective.Key;
166166
var overridenLevelOrSwitch = overrideDirective.Value;
167-
if (Enum.TryParse(overridenLevelOrSwitch, out LogEventLevel _))
167+
if (Enum.TryParse(overridenLevelOrSwitch, ignoreCase: true, out LogEventLevel _))
168168
{
169169
ApplyMinimumLevelConfiguration(overrideDirective, (configuration, levelSwitch) =>
170170
{
@@ -221,7 +221,7 @@ void SubscribeToLoggingLevelChanges(IConfigurationSection levelSection, LoggingL
221221
levelSection.GetReloadToken,
222222
() =>
223223
{
224-
if (Enum.TryParse(levelSection.Value, out LogEventLevel minimumLevel))
224+
if (Enum.TryParse(levelSection.Value, ignoreCase: true, out LogEventLevel minimumLevel))
225225
levelSwitch.MinimumLevel = minimumLevel;
226226
else
227227
SelfLog.WriteLine($"The value {levelSection.Value} is not a valid Serilog level.");
@@ -591,9 +591,7 @@ internal static bool IsValidSwitchName(string input)
591591
}
592592

593593
static LogEventLevel ParseLogEventLevel(string value)
594-
{
595-
if (!Enum.TryParse(value, ignoreCase: true, out LogEventLevel parsedLevel))
596-
throw new InvalidOperationException($"The value {value} is not a valid Serilog level.");
597-
return parsedLevel;
598-
}
594+
=> Enum.TryParse(value, ignoreCase: true, out LogEventLevel parsedLevel)
595+
? parsedLevel
596+
: throw new InvalidOperationException($"The value {value} is not a valid Serilog level.");
599597
}

src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class StringArgumentValue : IConfigurationArgumentValue
1010
{
1111
readonly string _providedValue;
1212

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

1515
public StringArgumentValue(string providedValue)
1616
{

0 commit comments

Comments
 (0)