This repository was archived by the owner on Dec 13, 2018. It is now read-only.
Issue #3: Refactoring ILogger #31
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,27 +29,41 @@ public Logger(global::NLog.Logger logger) | |
| _logger = logger; | ||
| } | ||
|
|
||
| public void Write( | ||
| TraceType eventType, | ||
| int eventId, | ||
| object state, | ||
| Exception exception, | ||
| Func<object, Exception, string> formatter) | ||
| { | ||
| var logLevel = GetLogLevel(eventType); | ||
| var message = string.Empty; | ||
| if (formatter != null) | ||
|
There was a problem hiding this comment. @lodejard What does it mean if the formatter is null after this refactoring? There was a problem hiding this comment. Maybe we ought to have a fallback? Like maybe call There was a problem hiding this comment. Or throw argument null exception? @Eilon's suggestion wouldn't be surprising either, but if the form a tter is null you're calling the wrong overload... |
||
| { | ||
| message = formatter(state, exception); | ||
| } | ||
| else | ||
| { | ||
| if (state != null) | ||
| { | ||
| message += state; | ||
| } | ||
| if (exception != null) | ||
| { | ||
| message += Environment.NewLine + exception; | ||
| } | ||
| } | ||
| if (!string.IsNullOrEmpty(message)) | ||
| { | ||
| var eventInfo = LogEventInfo.Create(logLevel, _logger.Name, message, exception); | ||
| eventInfo.Properties["EventId"] = eventId; | ||
| _logger.Log(eventInfo); | ||
| } | ||
| } | ||
|
|
||
| public bool IsEnabled(TraceType eventType) | ||
| { | ||
| return _logger.IsEnabled(GetLogLevel(eventType)); | ||
| } | ||
|
|
||
| private LogLevel GetLogLevel(TraceType eventType) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IsEnabledsounds more like a property name. MaybeIsEnableForis better?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
IsEnabledis fine for this, though maybe not ideal. But better thanIsEnabledFor😄