From 1624c51cb5a34204051bc845f850a60fa953c34d Mon Sep 17 00:00:00 2001 From: tuier Date: Fri, 23 Sep 2016 22:05:11 +0100 Subject: [PATCH] remove unused endpoint when using constraints in marathon --- provider/marathon.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/provider/marathon.go b/provider/marathon.go index afb9c105e..d0dddad78 100644 --- a/provider/marathon.go +++ b/provider/marathon.go @@ -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())