Refactor various utility functions into a consul/lib package #1666
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
Consolidate code duplication and tests into a single lib package. Most of these functions were from various **/util.go functions that couldn't be imported due to cyclic imports. The consul/lib package is intended to be a terminal node in an import DAG and a place to stash various consul-only helper functions. Pulled in hashicorp/go-uuid instead of consolidating UUID access.
Required for jitter calcs. This could be done in consul/agent, but this makes it clear it is done only once process-wide.
| @@ -41,7 +42,9 @@ func (p *PreparedQuery) Apply(args *structs.PreparedQueryRequest, reply *string) | |||
| // to collide since this isn't inside a write transaction. | |||
| state := p.srv.fsm.State() | |||
| for { | |||
| args.Query.ID = generateUUID() | |||
| if args.Query.ID, err = uuid.GenerateUUID(); err != nil { | |||
There was a problem hiding this comment.
Which err variable is in scope at this point? I'd expect a compile error here.
There was a problem hiding this comment.
It's using the function's return parameter, err. Upon entry into Apply, err is zero initialized and visible for the entire scope of Apply.
There was a problem hiding this comment.
Ah gotcha. Missed that one was named.
|
Noted a couple things I had questions about, otherwise looks good! |
|
LGTM |
exported function.
|
LGTM for reals |
sean-
added a commit
that referenced
this pull request
Feb 2, 2016
Refactor various utility functions into a consul/lib package
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.
Prevent the spread of duplicate code by breaking cyclic imports and consolidating various util functions into a consul/lib package.