(#17887) Only log if message has been initialized#1358
Closed
domcleal wants to merge 1 commit intopuppetlabs:masterfrom
Closed
(#17887) Only log if message has been initialized#1358domcleal wants to merge 1 commit intopuppetlabs:masterfrom
domcleal wants to merge 1 commit intopuppetlabs:masterfrom
Conversation
It's possible to run the "ensure" block without having executed either the main or "rescue" blocks, if an Exception not derived from StandardError is raised or when testing with Mocha expectations. If this happens during the property.sync, this causes an immediate exit from the main block, but the "ensure" block is still run. The event message won't have been initialized yet, so this then causes the logger to report: Puppet::Util::Log requires a message This changes the "ensure" block to only log if it's got as far as writing a message.
Contributor
|
@domcleal see my comments in http://projects.puppetlabs.com/issues/17887#note-4 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
It's possible to run the "ensure" block without having executed either the
main or "rescue" blocks, if an Exception not derived from StandardError is
raised or when testing with Mocha expectations.
If this happens during the property.sync, this causes an immediate exit from
the main block, but the "ensure" block is still run. The event message won't
have been initialized yet, so this then causes the logger to report:
Puppet::Util::Log requires a message
This changes the "ensure" block to only log if it's got as far as writing a
message.
Replaces GH-1307 to rebase against master and add a test.