Merge pull request #388 from sungam3r/case

Case-insensitive enum parsing for level overrides
serilog · Jul 5, 2023 · 2c62e41 · 2c62e41
2 parents d7e0dbd + ca95760
commit 2c62e41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs
@@ -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) =>
                 {
@@ -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.");
@@ -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.");
 }
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs
@@ -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)
     {