Skip to content

Commit f8813e9

Browse files
committed
Do not force filter switch names with a leading $ in OnFilterSwitchCreated callback
1 parent d22b9fe commit f8813e9

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ var logger = new LoggerConfiguration()
288288
.ReadFrom.Configuration(configuration, options)
289289
.CreateLogger();
290290
291-
ILoggingFilterSwitch filterSwitch = filterSwitches["$filterSwitch"];
291+
ILoggingFilterSwitch filterSwitch = filterSwitches["filterSwitch"];
292292
```
293293

294294
### Nested configuration sections

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ void ProcessFilterSwitchDeclarations()
7575
SetFilterSwitch(throwOnError: true);
7676
SubscribeToFilterExpressionChanges();
7777

78-
var referenceName = _resolutionContext.AddFilterSwitch(switchName, filterSwitch);
79-
_resolutionContext.ReaderOptions.OnFilterSwitchCreated?.Invoke(referenceName, filterSwitch);
78+
_resolutionContext.AddFilterSwitch(switchName, filterSwitch);
79+
_resolutionContext.ReaderOptions.OnFilterSwitchCreated?.Invoke(switchName, filterSwitch);
8080

8181
void SubscribeToFilterExpressionChanges()
8282
{

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReaderOptions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public ConfigurationReaderOptions() : this(dependencyContext: null)
7979

8080
/// <summary>
8181
/// Called when a log filter switch is created while reading the <c>Serilog:FilterSwitches</c> section of the configuration.
82-
/// The switch name includes the leading <c>$</c> character.
8382
/// </summary>
8483
public Action<string, ILoggingFilterSwitch>? OnFilterSwitchCreated { get; init; }
8584

src/Serilog.Settings.Configuration/Settings/Configuration/ResolutionContext.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,12 @@ public string AddLevelSwitch(string levelSwitchName, LoggingLevelSwitch levelSwi
6262
return referenceName;
6363
}
6464

65-
public string AddFilterSwitch(string filterSwitchName, LoggingFilterSwitchProxy filterSwitch)
65+
public void AddFilterSwitch(string filterSwitchName, LoggingFilterSwitchProxy filterSwitch)
6666
{
6767
if (filterSwitchName == null) throw new ArgumentNullException(nameof(filterSwitchName));
6868
if (filterSwitch == null) throw new ArgumentNullException(nameof(filterSwitch));
6969
var referenceName = ToSwitchReference(filterSwitchName);
7070
_declaredFilterSwitches[referenceName] = filterSwitch;
71-
return referenceName;
7271
}
7372

7473
string ToSwitchReference(string switchName)

0 commit comments

Comments
 (0)