find_localhost: Try both hostname and hostname -f before raising
#242
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
hostname -f might fail but hostname -s still succeed
albertvaka
changed the title
mx-psi
reviewed
Nov 19, 2020
lib/dogapi/common.rb
Outdated
| begin | ||
| out = Addrinfo.getaddrinfo(Socket.gethostname, nil, nil, nil, nil, Socket::AI_CANONNAME).first.canonname | ||
| rescue SocketError | ||
| out, status = Open3.capture2('hostname', '-s', err: File::NULL) |
There was a problem hiding this comment.
Do we actually want to use hostname -s? Or should we use just hostname? The reason why we bumped chef-handler was precisely because of a hostname -s warning (see #57)
There was a problem hiding this comment.
Good catch. I wasn't aware that Windows didn't support that flag. I used -s because on MacOS -f is the default, so on those if hostname -f fails, hostname will also fail. We have two options:
- Change the
hostnamecall we do depending on the platform - Remove the
-sand assume that on Mac we will have one less error recovery option.
Given this error path should be uncommon (our two other ways to get the hostname must fail), I will go with the second option to not increase the code complexity.
There was a problem hiding this comment.
I like the second option more too, we can always add complexity later for macOS if we need to
albertvaka
changed the title
hostname and hostname -f before raising
mx-psi
previously approved these changes
Nov 19, 2020
zippolyte
reviewed
Dec 4, 2020
Co-authored-by: Hippolyte HENRY <zippolyte@users.noreply.github.com>
zippolyte
approved these changes
Dec 4, 2020
zippolyte
added
the
changelog/Fixed
albertvaka
added a commit
to DataDog/chef-handler-datadog
that referenced
this pull request
Dec 7, 2020
To include DataDog/dogapi-rb#242
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.
What does this PR do?
Potential fix for DataDog/chef-handler-datadog#126
Since #219 we raise if we can't resolve the hostname. Before that (I believe) we returned an empty string, The previous behaviour is not what we want, but raising an exception now makes the problem more obvious. It seems that
hostname -fmight fail buthostname -sstill succeed, so this PR changes the code to try both before raising.