Skip to content

Allow client to set boltdb timeout#140

Merged
sanimej merged 2 commits intodocker:masterfrom
aboch:to
Nov 9, 2016
Merged

Allow client to set boltdb timeout#140
sanimej merged 2 commits intodocker:masterfrom
aboch:to

Conversation

@aboch
Copy link
Copy Markdown

@aboch aboch commented Oct 25, 2016

  • also in case of no persistent connection
  • Also fixing CI by bumping go version in .travis.yml

Related to moby/moby#26251
Related to moby/libnetwork#1374
Supersedes #135

Signed-off-by: Alessandro Boch aboch@docker.com

return nil, err
}
} else if options.ConnectionTimeout != 0 {
timeout = options.ConnectionTimeout
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets make this unconditional because the options.ConnectionTimeout is used always. This way BoltDB.timeout will reflect the right value if at all it has to be used elsewhere.

aboch added 2 commits November 8, 2016 16:51
- also in case of no persistent connection

Signed-off-by: Alessandro Boch <aboch@docker.com>
- To fix CI

Signed-off-by: Alessandro Boch <aboch@docker.com>
@sanimej
Copy link
Copy Markdown
Contributor

sanimej commented Nov 9, 2016

LGTM

@sanimej sanimej merged commit 1d84310 into docker:master Nov 9, 2016
bryant1410 pushed a commit to bryant1410/libkv that referenced this pull request Apr 18, 2017
Allow client to set boltdb timeout

Signed-off-by: Santiago Castro <santi.1410@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants