Add ability for marathon provider to set maxconn values, loadbalancer algorithm, and circuit breaker expression #616
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
|
to address #612 |
jangie
force-pushed
the
master
branch
3 times, most recently
from
0555693 to
5c21ee2
Compare
| @@ -79,7 +80,9 @@ func (p *BaseProvider) getConfiguration(defaultTemplateFile string, funcMap temp | |||
| return nil, err | |||
| } | |||
|
|
|||
| if _, err := toml.Decode(buffer.String(), configuration); err != nil { | |||
| var renderedTemplate = buffer.String() | |||
| log.Debugf("Rendering results of %s:\n%s", defaultTemplateFile, renderedTemplate) | |||
There was a problem hiding this comment.
Not sure if this is something that is desired, but it certainly helped me debug while coding this.
There was a problem hiding this comment.
Once this PR is ready, we should comment that indeed ;)
jangie
force-pushed
the
master
branch
2 times, most recently
from
d641121 to
2232ad3
Compare
jangie
force-pushed
the
master
branch
3 times, most recently
from
1d41c21 to
927eba5
Compare
jangie
changed the title
jangie
force-pushed
the
master
branch
6 times, most recently
from
b7095a3 to
d1ad1be
Compare
|
Thanks a lot @jangie :) |
|
@emilevauge I've removed the log statement for now. I'll be taking a stab at adding similar functionality to the other providers. Is it also your opinion that the maxconn settings should be an all-or-nothing affair? I.e., that without extractorfunc, amount should do nothing, as well as vice versa? |
jangie
force-pushed
the
master
branch
3 times, most recently
from
83f3523 to
a12600e
Compare
jangie
force-pushed
the
master
branch
2 times, most recently
from
bf94660 to
cc707cb
Compare
|
LGTM, but needs rebase :) |
|
Rebased |
|
Rebased again. |
Initial implementation: Force both to be present to trigger behavior. add ability to see rendered template in debug add support for loadbalancer and circuit breaker specification add documentation for new configuration
|
ping @containous/traefik |
vdemeester
approved these changes
Sep 15, 2016
emilevauge
approved these changes
Sep 15, 2016
ldez
added
status/3-needs-merge
area/provider/marathon
and removed
contributor/needs-resolve-conflicts
status/2-needs-review
labels
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.
Initial implementation: Force both maxconn labels to be present to trigger behavior.