Skip to content

Remove closure/delegate allocation from ConsoleLoggerProvider.CreateLogger #45236

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
stephentoub merged 2 commits into from
Nov 26, 2020
Merged

Remove closure/delegate allocation from ConsoleLoggerProvider.CreateLogger #45236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
451586d
Remove closure/delegate allocation from ConsoleLoggerProvider.CreateL…
stephentoub Nov 25, 2020
349ec7b
Update src/libraries/Microsoft.Extensions.Logging.Console/src/Console…
jkotas Nov 26, 2020
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
18 changes: 11 additions & 7 deletions src/libraries/Microsoft.Extensions.Logging.Console/src/ConsoleLoggerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,24 @@ public ILogger CreateLogger(string name)
ConsoleLoggerFormat.Systemd => _formatters[ConsoleFormatterNames.Systemd],
_ => _formatters[ConsoleFormatterNames.Simple],
};
#pragma warning restore CS0618

if (_options.CurrentValue.FormatterName == null)
{
UpdateFormatterOptions(logFormatter, _options.CurrentValue);
}
#pragma warning restore CS0618
}

return _loggers.GetOrAdd(name, loggerName => new ConsoleLogger(name, _messageQueue)
{
Options = _options.CurrentValue,
ScopeProvider = _scopeProvider,
Formatter = logFormatter,
});
return _loggers.TryGetValue(name, out ConsoleLogger logger) ?
logger :
_loggers.GetOrAdd(name, new ConsoleLogger(name, _messageQueue)
{
Options = _options.CurrentValue,
ScopeProvider = _scopeProvider,
Formatter = logFormatter,
});
}

#pragma warning disable CS0618
private void UpdateFormatterOptions(ConsoleFormatter formatter, ConsoleLoggerOptions deprecatedFromOptions)
{
Expand Down