Skip to content

Observe Microsoft.Extensions.Logging.LogLevel.None #203

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

Merged
merged 1 commit into from
Apr 7, 2022
Merged

Observe Microsoft.Extensions.Logging.LogLevel.None #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public SerilogLogger(

public bool IsEnabled(LogLevel logLevel)
{
return _logger.IsEnabled(LevelConvert.ToSerilogLevel(logLevel));
return logLevel != LogLevel.None && _logger.IsEnabled(LevelConvert.ToSerilogLevel(logLevel));
}

public IDisposable BeginScope<TState>(TState state)
Expand All @@ -54,6 +54,10 @@ public IDisposable BeginScope<TState>(TState state)

public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
{
if (logLevel == LogLevel.None)
{
return;
}
var level = LevelConvert.ToSerilogLevel(logLevel);
if (!_logger.IsEnabled(level))
{
Expand Down
23 changes: 23 additions & 0 deletions test/Serilog.Extensions.Logging.Tests/SerilogLoggerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public void LogsCorrectLevel()
logger.Log(LogLevel.Warning, 0, TestMessage, null, null);
logger.Log(LogLevel.Error, 0, TestMessage, null, null);
logger.Log(LogLevel.Critical, 0, TestMessage, null, null);
logger.Log(LogLevel.None, 0, TestMessage, null, null);

Assert.Equal(6, sink.Writes.Count);
Assert.Equal(LogEventLevel.Verbose, sink.Writes[0].Level);
Expand All @@ -65,43 +66,65 @@ public void LogsCorrectLevel()
Assert.Equal(LogEventLevel.Fatal, sink.Writes[5].Level);
}


[Theory]
[InlineData(LogLevel.Trace, true)]
[InlineData(LogLevel.Debug, true)]
[InlineData(LogLevel.Information, true)]
[InlineData(LogLevel.Warning, true)]
[InlineData(LogLevel.Error, true)]
[InlineData(LogLevel.Critical, true)]
[InlineData(LogLevel.None, false)]
public void IsEnabledCorrect(LogLevel logLevel, bool isEnabled)
{
var (logger, _) = SetUp(LogLevel.Trace);

Assert.Equal(isEnabled, logger.IsEnabled(logLevel));
}

[Theory]
[InlineData(LogLevel.Trace, LogLevel.Trace, 1)]
[InlineData(LogLevel.Trace, LogLevel.Debug, 1)]
[InlineData(LogLevel.Trace, LogLevel.Information, 1)]
[InlineData(LogLevel.Trace, LogLevel.Warning, 1)]
[InlineData(LogLevel.Trace, LogLevel.Error, 1)]
[InlineData(LogLevel.Trace, LogLevel.Critical, 1)]
[InlineData(LogLevel.Trace, LogLevel.None, 0)]
[InlineData(LogLevel.Debug, LogLevel.Trace, 0)]
[InlineData(LogLevel.Debug, LogLevel.Debug, 1)]
[InlineData(LogLevel.Debug, LogLevel.Information, 1)]
[InlineData(LogLevel.Debug, LogLevel.Warning, 1)]
[InlineData(LogLevel.Debug, LogLevel.Error, 1)]
[InlineData(LogLevel.Debug, LogLevel.Critical, 1)]
[InlineData(LogLevel.Debug, LogLevel.None, 0)]
[InlineData(LogLevel.Information, LogLevel.Trace, 0)]
[InlineData(LogLevel.Information, LogLevel.Debug, 0)]
[InlineData(LogLevel.Information, LogLevel.Information, 1)]
[InlineData(LogLevel.Information, LogLevel.Warning, 1)]
[InlineData(LogLevel.Information, LogLevel.Error, 1)]
[InlineData(LogLevel.Information, LogLevel.Critical, 1)]
[InlineData(LogLevel.Information, LogLevel.None, 0)]
[InlineData(LogLevel.Warning, LogLevel.Trace, 0)]
[InlineData(LogLevel.Warning, LogLevel.Debug, 0)]
[InlineData(LogLevel.Warning, LogLevel.Information, 0)]
[InlineData(LogLevel.Warning, LogLevel.Warning, 1)]
[InlineData(LogLevel.Warning, LogLevel.Error, 1)]
[InlineData(LogLevel.Warning, LogLevel.Critical, 1)]
[InlineData(LogLevel.Warning, LogLevel.None, 0)]
[InlineData(LogLevel.Error, LogLevel.Trace, 0)]
[InlineData(LogLevel.Error, LogLevel.Debug, 0)]
[InlineData(LogLevel.Error, LogLevel.Information, 0)]
[InlineData(LogLevel.Error, LogLevel.Warning, 0)]
[InlineData(LogLevel.Error, LogLevel.Error, 1)]
[InlineData(LogLevel.Error, LogLevel.Critical, 1)]
[InlineData(LogLevel.Error, LogLevel.None, 0)]
[InlineData(LogLevel.Critical, LogLevel.Trace, 0)]
[InlineData(LogLevel.Critical, LogLevel.Debug, 0)]
[InlineData(LogLevel.Critical, LogLevel.Information, 0)]
[InlineData(LogLevel.Critical, LogLevel.Warning, 0)]
[InlineData(LogLevel.Critical, LogLevel.Error, 0)]
[InlineData(LogLevel.Critical, LogLevel.Critical, 1)]
[InlineData(LogLevel.Critical, LogLevel.None, 0)]
public void LogsWhenEnabled(LogLevel minLevel, LogLevel logLevel, int expected)
{
var (logger, sink) = SetUp(minLevel);
Expand Down