Changes host-based node IDs from opt-out to opt-in. #3187
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
reviewed
Jun 25, 2017
| @@ -238,6 +241,7 @@ func (cmd *AgentCommand) readConfig() *agent.Config { | |||
| cmdCfg.DNSRecursors = append(cmdCfg.DNSRecursors, dnsRecursors...) | |||
|
|
|||
| cfg = agent.MergeConfig(cfg, &cmdCfg) | |||
| disableHostNodeID.Merge(cfg.DisableHostNodeID) | |||
There was a problem hiding this comment.
If the CLI argument was set (pointer is non-null), then this will take its value and lay it on top of the one from the config files. This ended up being kind of nasty because we had a CLI version of the flag, not just a config one, so it needed this special handling.
| tmpDir := testutil.TempDir(t, "consul") | ||
| defer os.RemoveAll(tmpDir) | ||
|
|
||
| shutdownCh := make(chan struct{}) |
There was a problem hiding this comment.
Just curious if you need the shutdownCh if you're just reading the config.
There was a problem hiding this comment.
You are right - this isn't needed so I'll delete it.
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.
Closes #3171.