Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Commit bc8ba8a

Browse files
BrennanConroyBrennanConroy
committed
Set background color with foreground color in ConsoleLogger
1 parent 0a049e7 commit bc8ba8a

File tree

2 files changed

+47
-45
lines changed

2 files changed

+47
-45
lines changed

‎src/Microsoft.Extensions.Logging.Console/ConsoleLogger.cs

+11-9
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ public virtual void WriteMessage(LogLevel logLevel, string logName, int eventId,
133133
// category and event id
134134
// use default colors
135135
WriteWithColor(
136-
ConsoleColor.Gray,
137-
DefaultConsoleColor,
136+
logLevelColors.Foreground,
137+
logLevelColors.Background,
138138
_loglevelPadding + logName + $"[{eventId}]",
139139
newLine: true);
140140

@@ -145,7 +145,7 @@ public virtual void WriteMessage(LogLevel logLevel, string logName, int eventId,
145145
if (!string.IsNullOrEmpty(scopeInformation))
146146
{
147147
WriteWithColor(
148-
ConsoleColor.Gray,
148+
DefaultConsoleColor,
149149
DefaultConsoleColor,
150150
_messagePadding + scopeInformation,
151151
newLine: true);
@@ -154,7 +154,7 @@ public virtual void WriteMessage(LogLevel logLevel, string logName, int eventId,
154154

155155
// message
156156
WriteWithColor(
157-
ConsoleColor.White,
157+
DefaultConsoleColor,
158158
DefaultConsoleColor,
159159
_messagePadding + message,
160160
newLine: true);
@@ -183,7 +183,7 @@ private void WriteException(LogLevel logLevel, string logName, int eventId, Exce
183183
{
184184
// exception message
185185
WriteWithColor(
186-
ConsoleColor.White,
186+
DefaultConsoleColor,
187187
DefaultConsoleColor,
188188
ex.ToString(),
189189
newLine: true);
@@ -238,15 +238,17 @@ private ConsoleColors GetLogLevelConsoleColors(LogLevel logLevel)
238238
case LogLevel.Critical:
239239
return new ConsoleColors(ConsoleColor.White, ConsoleColor.Red);
240240
case LogLevel.Error:
241-
return new ConsoleColors(ConsoleColor.Red, DefaultConsoleColor);
241+
return new ConsoleColors(ConsoleColor.Red, ConsoleColor.Black);
242242
case LogLevel.Warning:
243-
return new ConsoleColors(ConsoleColor.DarkYellow, DefaultConsoleColor);
243+
return new ConsoleColors(ConsoleColor.Yellow, ConsoleColor.Black);
244244
case LogLevel.Information:
245-
return new ConsoleColors(ConsoleColor.DarkGreen, DefaultConsoleColor);
245+
return new ConsoleColors(ConsoleColor.DarkGreen, ConsoleColor.Black);
246246
case LogLevel.Debug:
247+
return new ConsoleColors(ConsoleColor.Gray, ConsoleColor.Black);
247248
case LogLevel.Trace:
249+
return new ConsoleColors(ConsoleColor.Gray, ConsoleColor.Black);
248250
default:
249-
return new ConsoleColors(ConsoleColor.Gray, DefaultConsoleColor);
251+
return new ConsoleColors(DefaultConsoleColor, DefaultConsoleColor);
250252
}
251253
}
252254

‎test/Microsoft.Extensions.Logging.Test/ConsoleLoggerTest.cs

+36-36
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,11 @@ public void WriteCritical_LogsCorrectColors()
296296
Assert.Equal(ConsoleColor.Red, write.BackgroundColor);
297297
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
298298
write = sink.Writes[1];
299-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
300-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
299+
Assert.Equal(ConsoleColor.Red, write.BackgroundColor);
300+
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
301301
write = sink.Writes[2];
302302
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
303-
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
303+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
304304
}
305305

306306
[Fact]
@@ -317,14 +317,14 @@ public void WriteError_LogsCorrectColors()
317317
// Assert
318318
Assert.Equal(3, sink.Writes.Count);
319319
var write = sink.Writes[0];
320-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
320+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
321321
Assert.Equal(ConsoleColor.Red, write.ForegroundColor);
322322
write = sink.Writes[1];
323-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
324-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
323+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
324+
Assert.Equal(ConsoleColor.Red, write.ForegroundColor);
325325
write = sink.Writes[2];
326326
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
327-
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
327+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
328328
}
329329

330330
[Fact]
@@ -341,14 +341,14 @@ public void WriteWarning_LogsCorrectColors()
341341
// Assert
342342
Assert.Equal(3, sink.Writes.Count);
343343
var write = sink.Writes[0];
344-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
345-
Assert.Equal(ConsoleColor.DarkYellow, write.ForegroundColor);
344+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
345+
Assert.Equal(ConsoleColor.Yellow, write.ForegroundColor);
346346
write = sink.Writes[1];
347-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
348-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
347+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
348+
Assert.Equal(ConsoleColor.Yellow, write.ForegroundColor);
349349
write = sink.Writes[2];
350350
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
351-
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
351+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
352352
}
353353

354354
[Fact]
@@ -365,14 +365,14 @@ public void WriteInformation_LogsCorrectColors()
365365
// Assert
366366
Assert.Equal(3, sink.Writes.Count);
367367
var write = sink.Writes[0];
368-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
368+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
369369
Assert.Equal(ConsoleColor.DarkGreen, write.ForegroundColor);
370370
write = sink.Writes[1];
371-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
372-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
371+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
372+
Assert.Equal(ConsoleColor.DarkGreen, write.ForegroundColor);
373373
write = sink.Writes[2];
374374
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
375-
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
375+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
376376
}
377377

378378
[Fact]
@@ -389,14 +389,14 @@ public void WriteDebug_LogsCorrectColors()
389389
// Assert
390390
Assert.Equal(3, sink.Writes.Count);
391391
var write = sink.Writes[0];
392-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
392+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
393393
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
394394
write = sink.Writes[1];
395-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
395+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
396396
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
397397
write = sink.Writes[2];
398398
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
399-
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
399+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
400400
}
401401

402402
[Fact]
@@ -413,14 +413,14 @@ public void WriteTrace_LogsCorrectColors()
413413
// Assert
414414
Assert.Equal(3, sink.Writes.Count);
415415
var write = sink.Writes[0];
416-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
416+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
417417
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
418418
write = sink.Writes[1];
419-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
419+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
420420
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
421421
write = sink.Writes[2];
422422
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
423-
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
423+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
424424
}
425425

426426
[Fact]
@@ -464,14 +464,14 @@ public void NoLogScope_DoesNotWriteAnyScopeContentToOutput()
464464
// Assert
465465
Assert.Equal(3, sink.Writes.Count);
466466
var write = sink.Writes[0];
467-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
468-
Assert.Equal(ConsoleColor.DarkYellow, write.ForegroundColor);
467+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
468+
Assert.Equal(ConsoleColor.Yellow, write.ForegroundColor);
469469
write = sink.Writes[1];
470-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
471-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
470+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
471+
Assert.Equal(ConsoleColor.Yellow, write.ForegroundColor);
472472
write = sink.Writes[2];
473473
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
474-
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
474+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
475475
}
476476

477477
[Fact]
@@ -493,17 +493,17 @@ public void WritingScopes_LogsWithCorrectColors()
493493
// Assert
494494
Assert.Equal(4, sink.Writes.Count);
495495
var write = sink.Writes[0];
496-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
496+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
497497
Assert.Equal(ConsoleColor.DarkGreen, write.ForegroundColor);
498498
write = sink.Writes[1];
499-
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
500-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
499+
Assert.Equal(ConsoleColor.Black, write.BackgroundColor);
500+
Assert.Equal(ConsoleColor.DarkGreen, write.ForegroundColor);
501501
write = sink.Writes[2];
502502
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
503-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
503+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
504504
write = sink.Writes[3];
505505
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
506-
Assert.Equal(ConsoleColor.White, write.ForegroundColor);
506+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
507507
}
508508

509509
[Fact]
@@ -530,7 +530,7 @@ public void WritingScopes_LogsExpectedMessage()
530530
var write = sink.Writes[2];
531531
Assert.Equal(expectedMessage, write.Message);
532532
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
533-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
533+
Assert.Equal(TestConsole.DefaultBackgroundColor, write.ForegroundColor);
534534
}
535535

536536
[Fact]
@@ -560,7 +560,7 @@ public void WritingNestedScopes_LogsExpectedMessage()
560560
var write = sink.Writes[2];
561561
Assert.Equal(expectedMessage, write.Message);
562562
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
563-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
563+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
564564
}
565565

566566
[Fact]
@@ -599,11 +599,11 @@ public void WritingMultipleScopes_LogsExpectedMessage()
599599
var write = sink.Writes[2];
600600
Assert.Equal(expectedMessage1, write.Message);
601601
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
602-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
602+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
603603
write = sink.Writes[6];
604604
Assert.Equal(expectedMessage2, write.Message);
605605
Assert.Equal(TestConsole.DefaultBackgroundColor, write.BackgroundColor);
606-
Assert.Equal(ConsoleColor.Gray, write.ForegroundColor);
606+
Assert.Equal(TestConsole.DefaultForegroundColor, write.ForegroundColor);
607607
}
608608

609609
[Fact]

0 commit comments

Comments
 (0)