Bugfix: Can't update EventLog's Source property #1548
Merged
Conversation
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
EventLog Source not updated - Fix
| @@ -349,7 +349,9 @@ internal string GetFixedSource() | |||
| /// <returns></returns> | |||
| private EventLog GetEventLog(LogEventInfo logEvent) | |||
| { | |||
| return eventLogInstance ?? (eventLogInstance = new EventLog(this.Log, this.MachineName, this.Source.Render(logEvent))); | |||
| if (eventLogInstance?.Source == this.Source.Render(logEvent)) | |||
There was a problem hiding this comment.
In worst case we're rendering the source two times?
Also there is an (implicit) two times check on null and we need to check also log and machine?
There was a problem hiding this comment.
Do you mean something like this?
if (eventLogInstance?.Source == this.Source.Render(logEvent) && eventLogInstance?.Log == this.Log && eventLogInstance?.MachineName == this.MachineName)
return eventLogInstance ?? (eventLogInstance = new EventLog(this.Log, this.MachineName, this.Source.Render(logEvent)));
return eventLogInstance = new EventLog(this.Log, this.MachineName, this.Source.Render(logEvent));There was a problem hiding this comment.
Think it fixes the issue (hard to read on mobile) but Its still double checking null (?. and ==), which is a bit sloppy
|
Thanks! Added a note. Not sure why appveyor complains, looks unrelated |
Current coverage is 76% (diff: 75%)@@ master #1548 diff @@
==========================================
Files 269 269
Lines 16266 16288 +22
Methods 2605 2607 +2
Messages 0 0
Branches 1769 1776 +7
==========================================
+ Hits 12367 12386 +19
- Misses 3487 3491 +4
+ Partials 412 411 -1
|
304NotModified
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #1542