baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #697 from tuier/remove_unused_endpoint_marathon

Browse source 
Remove unused endpoint when using constraints with Marathon provider
This commit is contained in:
Emile Vauge 2016-09-27 15:18:48 +02:00 committed by GitHub
parent 83aabefcc5 1624c51cb5
commit 03d16d12d5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
provider/marathon.go
View file

@ -188,14 +188,13 @@ func (provider *Marathon) taskFilter(task marathon.Task, applications *marathon.
log.Errorf("Unable to get marathon application from task %s", task.AppID)
return false
}
if label, err := provider.getLabel(application, "traefik.tags"); err == nil {
constraintTags := strings.Split(label, ",")
if ok, failingConstraint := provider.MatchConstraints(constraintTags); !ok {
if failingConstraint != nil {
log.Debugf("Application %v pruned by '%v' constraint", application.ID, failingConstraint.String())
}
return false
label, _ := provider.getLabel(application, "traefik.tags")
constraintTags := strings.Split(label, ",")
if ok, failingConstraint := provider.MatchConstraints(constraintTags); !ok {
if failingConstraint != nil {
log.Debugf("Application %v pruned by '%v' constraint", application.ID, failingConstraint.String())
}
return false
}
if !isApplicationEnabled(application, exposedByDefaultFlag) {
@ -258,7 +257,8 @@ func (provider *Marathon) taskFilter(task marathon.Task, applications *marathon.
}
func (provider *Marathon) applicationFilter(app marathon.Application, filteredTasks []marathon.Task) bool {
constraintTags := strings.Split((*app.Labels)["traefik.tags"], ",")
label, _ := provider.getLabel(app, "traefik.tags")
constraintTags := strings.Split(label, ",")
if ok, failingConstraint := provider.MatchConstraints(constraintTags); !ok {
if failingConstraint != nil {
log.Debugf("Application %v pruned by '%v' constraint", app.ID, failingConstraint.String())