Skip to content

Commit 5cb3d11

Browse files
authored
Merge pull request #20 from altso/log-format
Change log message format
2 parents ae02635 + 4323ef0 commit 5cb3d11

File tree

2 files changed

+5
-31
lines changed

2 files changed

+5
-31
lines changed

Source/ExcelRna.Extensions.Logging.Tests/LogDisplayLoggerTests.cs

+1-14
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void Log_includes_timestamp()
102102
// ARRANGE
103103
var logger = new LogDisplayLogger("Test", new LogDisplayLoggerOptions
104104
{
105-
TimestampFormat = "yyyy-MM-dd HH:mm:ss ",
105+
TimestampFormat = "yyyy-MM-dd HH:mm:ss",
106106
})
107107
{
108108
RecordLine = Mock.Of<Action<string, object[]>>(),
@@ -158,17 +158,4 @@ public void Log_does_not_show_LogDisplay(LogLevel level)
158158
// ASSERT
159159
Mock.Get(logger.Show).Verify(invoke => invoke(), Times.Never);
160160
}
161-
162-
[Fact]
163-
public void Log_throws_when_logLevel_is_wrong()
164-
{
165-
// ARRANGE
166-
var logger = new LogDisplayLogger("Test");
167-
168-
// ACT & ASSERT
169-
Assert.Throws<ArgumentOutOfRangeException>(() =>
170-
{
171-
logger.Log((LogLevel)100, new Exception("TestException"), "TestMessage");
172-
});
173-
}
174161
}

Source/ExcelRna.Extensions.Logging/LogDisplayLogger.cs

+4-17
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
6767
builder.Append(" ");
6868
}
6969

70-
builder.Append(GetLogLevelString(logLevel));
71-
builder.Append(": ");
70+
builder.Append("[");
71+
builder.Append(logLevel);
72+
builder.Append("] ");
7273
builder.Append(_name);
73-
builder.Append(" ");
74+
builder.Append(": ");
7475
builder.Append(message);
7576

7677
if (exception != null)
@@ -86,18 +87,4 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
8687
Show();
8788
}
8889
}
89-
90-
private static string GetLogLevelString(LogLevel logLevel)
91-
{
92-
return logLevel switch
93-
{
94-
LogLevel.Trace => "trce",
95-
LogLevel.Debug => "dbug",
96-
LogLevel.Information => "info",
97-
LogLevel.Warning => "warn",
98-
LogLevel.Error => "fail",
99-
LogLevel.Critical => "crit",
100-
_ => throw new ArgumentOutOfRangeException(nameof(logLevel))
101-
};
102-
}
10390
}

0 commit comments

Comments
 (0)