Fixes #37 | Configure consul timeouts #44
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
janisz
force-pushed
the
configure_consul_request_timeout
branch
from
1678785
to
8e143dc
Compare
| @@ -85,6 +85,11 @@ func (a *ConcurrentAgents) createAgent(host string) (*consulapi.Client, error) { | |||
| config.Scheme = "https" | |||
| } | |||
|
|
|||
| if a.config.Timeout != 0 { | |||
| log.Debugf("Seting timeout to %s", a.config.Timeout.String()) | |||
janisz
force-pushed
the
configure_consul_request_timeout
branch
from
8e143dc
to
09d1411
Compare
| @@ -70,6 +70,7 @@ consul-ssl-cert | | Path to an SSL client certifica | |||
| consul-ssl-verify | `true` | Verify certificates when connecting via SSL | |||
| consul-token | | The Consul ACL token | |||
| consul-tag | `marathon` | Common tag name added to every service registered in Consul, should be unique for every Marathon-cluster connected to Consul | |||
| consul-timeout | `1 s` | Max request duration | |||
janisz
force-pushed
the
configure_consul_request_timeout
branch
2 times, most recently
from
9e81370
to
27f2060
Compare
janisz
force-pushed
the
configure_consul_request_timeout
branch
from
27f2060
to
853a87c
Compare
|
👍 |
janisz
added a commit
that referenced
this pull request
Jan 29, 2016
Fixes #37 | Configure consul timeouts
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.
No description provided.