Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
824c4d3
structured logger formatter prototype
maryamariyan Apr 15, 2020
833b53d
add ref to Linq + add public apis
maryamariyan Apr 15, 2020
1f02cdc
New APIs for Structured Log Formatting
maryamariyan May 12, 2020
8ecb51e
Apply review feedback
maryamariyan May 14, 2020
ed1f429
nit cleanup
maryamariyan May 14, 2020
4516d5a
- messages can color vars in messages (Compact)
maryamariyan May 15, 2020
ae2e2fa
TODO
maryamariyan May 15, 2020
b89910d
Rename to XConsoleLog...
maryamariyan May 15, 2020
ecf8bdd
FormatterNames const not instance properties
maryamariyan May 15, 2020
fc946f0
add AddCompact and other helpers
maryamariyan May 15, 2020
8ebc659
Rename AddCompactFormatter for short?
maryamariyan May 15, 2020
5141aba
Revert "Rename AddCompactFormatter for short?"
maryamariyan May 21, 2020
6d04fb4
Add back deprecated APIs
maryamariyan May 21, 2020
b9a004e
exception messaging in compact remains single line
maryamariyan May 21, 2020
44906fb
cleanup
maryamariyan May 26, 2020
bdb4244
rename default to colored
maryamariyan May 26, 2020
d2e187a
deprecate ConsoleLoggerFormat
maryamariyan May 26, 2020
bc056e2
minor rename
maryamariyan May 26, 2020
6ffc7e7
Rename back to default formatter
maryamariyan May 27, 2020
58d3e88
triple slash comments on new helpers
maryamariyan May 28, 2020
f514a8c
slight impl fixup
maryamariyan May 28, 2020
c4bc2ef
ConsoleLoggerProvider: keep ctor not deprecate
maryamariyan May 28, 2020
0b41bed
Added triple slash comments
maryamariyan May 28, 2020
fa81978
corner cases
maryamariyan May 29, 2020
22d2eff
version 3 log formatter
maryamariyan Jun 11, 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
Prev Previous commit
Next Next commit
slight impl fixup
  • Loading branch information
maryamariyan committed Jun 11, 2020
commit f514a8c4c42eaab4c359e255e47118224a04e51a
Original file line number Diff line number Diff line change
Expand Up @@ -62,28 +62,36 @@ public ConsoleLoggerProvider(IOptionsMonitor<ConsoleLoggerOptions> options, IEnu
// warning: ReloadLoggerOptions can be called before the ctor completed,... before registering all of the state used in this method need to be initialized
private void ReloadLoggerOptions(ConsoleLoggerOptions options)
{
IConsoleLogFormatter logFormatter = null;
if (options.FormatterName != null)
string nameFromFormat = Enum.GetName(typeof(ConsoleLoggerFormat), options.Format);
if (!_formatters.TryGetValue(options.FormatterName?.ToLower(), out IConsoleLogFormatter logFormatter))
{
_formatters.TryGetValue(options.FormatterName.ToLower(), out logFormatter);
}
//else
//{
// string nameFromFormat = Enum.GetName(typeof(ConsoleLoggerFormat), options?.Format);
// _formatters.TryGetValue(nameFromFormat, out IConsoleLogFormatter logFormatter);
// UpdateFormatterOptions(logFormatter, options);
//}
if (logFormatter == null)
{
logFormatter = _formatters[ConsoleLogFormatterNames.Default];
logFormatter = _formatters[nameFromFormat];
}
UpdateFormatterOptions(logFormatter, options);

foreach (var logger in _loggers)
{
logger.Value.Formatter = logFormatter;
}
}

/// <inheritdoc />
public ILogger CreateLogger(string name)
{
string nameFromFormat = Enum.GetName(typeof(ConsoleLoggerFormat), _options.CurrentValue.Format);
if (!_formatters.TryGetValue(_options.CurrentValue.FormatterName?.ToLower(), out IConsoleLogFormatter logFormatter))
{
logFormatter = _formatters[nameFromFormat];
}
UpdateFormatterOptions(logFormatter, _options.CurrentValue);

return _loggers.GetOrAdd(name, loggerName => new ConsoleLogger(name, _messageQueue)
{
ScopeProvider = _scopeProvider,
Formatter = logFormatter
});
}

private void UpdateFormatterOptions(IConsoleLogFormatter formatter, ConsoleLoggerOptions deprecatedFromOptions)
{
if (deprecatedFromOptions.FormatterName != null)
Expand All @@ -107,24 +115,6 @@ private void UpdateFormatterOptions(IConsoleLogFormatter formatter, ConsoleLogge
}
}

/// <inheritdoc />
public ILogger CreateLogger(string name)
{
string nameFromFormat = Enum.GetName(typeof(ConsoleLoggerFormat), _options.CurrentValue.Format);
_formatters.TryGetValue(_options.CurrentValue.FormatterName ?? nameFromFormat, out IConsoleLogFormatter logFormatter);
if (logFormatter == null)
{
logFormatter = _formatters[nameFromFormat];
}
UpdateFormatterOptions(logFormatter, _options.CurrentValue);

return _loggers.GetOrAdd(name, loggerName => new ConsoleLogger(name, _messageQueue)
{
ScopeProvider = _scopeProvider,
Formatter = logFormatter
});
}

/// <inheritdoc />
public void Dispose()
{
Expand Down