Fix socket handling in mysql resource #1971
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
adamleff
suggested changes
Jun 26, 2017
lib/resources/mysql_session.rb
Outdated
| @@ -44,9 +44,9 @@ def query(q, db = '') | |||
| cmd = inspec.command(command) | |||
| out = cmd.stdout + "\n" + cmd.stderr | |||
| if out =~ /Can't connect to .* MySQL server/ or | |||
| out.downcase =~ /^error/ | |||
| out.downcase =~ /^error/ | |||
There was a problem hiding this comment.
That space is needed to appease Rubocop since it's a multiline conditional. We should also take this opportunity to change the or to || in the line above it.
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
chris-rock
force-pushed
the
chris-rock/mysql-fixes
branch
from
79a106a
to
bdd7944
Compare
|
Rubocop issue fixed! Thank you @adamleff |
arlimus
approved these changes
Jun 27, 2017
|
Kudos for the PR and review guys! :) |
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.
Signed-off-by: Christoph Hartmann chris@lollyrock.com