Fixed regression with dns server start condition #3137
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
magiconair
suggested changes
Jun 9, 2017
command/agent/agent.go
Outdated
| @@ -291,8 +291,10 @@ func (a *Agent) Start() error { | |||
| } | |||
|
|
|||
| // start DNS servers | |||
| if err := a.listenAndServeDNS(); err != nil { | |||
| return err | |||
| if c.Ports.DNS > 0 { | |||
There was a problem hiding this comment.
A better way to fix this is for config.DNSAddrs() to return an empty array.
There was a problem hiding this comment.
Which it does for Ports.DNS == 0 but not <0
There was a problem hiding this comment.
slackpad
reviewed
Jun 9, 2017
command/agent/config.go
Outdated
| @@ -790,7 +790,7 @@ func (p ProtoAddr) String() string { | |||
| } | |||
|
|
|||
| func (c *Config) DNSAddrs() ([]ProtoAddr, error) { | |||
| if c.Ports.DNS == 0 { | |||
| if c.Ports.DNS < 0 { | |||
There was a problem hiding this comment.
We could probably use <=0 to keep parity with the HTTP implementation below.
There was a problem hiding this comment.
Also, previously the code checked for > 0 to enable. Inverting it is <= 0
preetapan
commented
Jun 9, 2017
| @@ -790,7 +790,7 @@ func (p ProtoAddr) String() string { | |||
| } | |||
|
|
|||
| func (c *Config) DNSAddrs() ([]ProtoAddr, error) { | |||
| if c.Ports.DNS == 0 { | |||
| if c.Ports.DNS <= 0 { | |||
magiconair
approved these changes
Jun 9, 2017
|
LGTM. Can you squash merge this since only the last commit is relevant? |
|
This looked good so I went ahead and merged + updated the changelog. |
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.
Found by comparing sha hashes 10540f8 and b6c69eb
Fixes #3135