Skip to content

Commit beca881

Browse files
Prints logger category for debug and trace messages (#1250)
1 parent 7c0b627 commit beca881

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

DevProxy.Abstractions/Plugins/BasePlugin.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ public override async Task InitializeAsync(InitArgs e)
107107
{
108108
await base.InitializeAsync(e);
109109

110-
// We need to begin a scope because we're in an abstract class with
111-
// a generic ILogger
112-
using var scope = Logger.BeginScope(Name);
113-
114110
var (IsValid, ValidationErrors) = await ValidatePluginConfig();
115111
if (!IsValid)
116112
{

DevProxy/Logging/ProxyConsoleFormatter.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private void LogRegularLogMessage<TState>(in LogEntry<TState> logEntry, IExterna
178178
private void WriteRegularLogMessage<TState>(in LogEntry<TState> logEntry, IExternalScopeProvider? scopeProvider, TextWriter textWriter)
179179
{
180180
var message = logEntry.Formatter(logEntry.State, logEntry.Exception);
181-
WriteMessageWithLabel(message, logEntry.LogLevel, scopeProvider, textWriter);
181+
WriteMessageWithLabel(message, logEntry.Category, logEntry.LogLevel, scopeProvider, textWriter);
182182

183183
if (logEntry.Exception is not null)
184184
{
@@ -187,7 +187,7 @@ private void WriteRegularLogMessage<TState>(in LogEntry<TState> logEntry, IExter
187187
textWriter.WriteLine();
188188
}
189189

190-
private void WriteMessageWithLabel(string? message, LogLevel logLevel, IExternalScopeProvider? scopeProvider, TextWriter textWriter)
190+
private void WriteMessageWithLabel(string? message, string category, LogLevel logLevel, IExternalScopeProvider? scopeProvider, TextWriter textWriter)
191191
{
192192
if (message is null)
193193
{
@@ -200,9 +200,10 @@ private void WriteMessageWithLabel(string? message, LogLevel logLevel, IExternal
200200
WriteLabel(textWriter, label, bgColor, fgColor);
201201
textWriter.Write($"{_labelSpacing}{_boxSpacing}");
202202

203-
if (logLevel == LogLevel.Debug)
203+
if (logLevel <= LogLevel.Debug)
204204
{
205-
textWriter.Write($"[{DateTime.Now:T}] ");
205+
textWriter.Write($"[{DateTime.Now:HH:mm:ss.fffffff}] ");
206+
textWriter.Write($"{category.Split('.').Last()}: ");
206207
}
207208

208209
WriteScopes(scopeProvider, textWriter);

0 commit comments

Comments
 (0)