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

Merge pull request #83 from emilevauge/marathon-filter-healthchecks

Browse source 
Add healthcheck filter in marathon tasks
This commit is contained in:
Vincent Demeester 2015-11-01 22:27:28 +01:00
parent b029e7eded d888b4fcb5
commit aae7941689
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
marathon.go
View file

@ -114,7 +114,7 @@ func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
//filter tasks //filter tasks
filteredTasks := fun.Filter(func(task marathon.Task) bool { filteredTasks := fun.Filter(func(task marathon.Task) bool {
if len(task.Ports) == 0 { if len(task.Ports) == 0 {
log.Debug("Filtering marathon task without port", task.AppID) log.Debug("Filtering marathon task without port %s", task.AppID)
return false return false
} }
application, errApp := getApplication(task, applications.Apps) application, errApp := getApplication(task, applications.Apps)
@ -124,13 +124,28 @@ func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
} }
_, err := strconv.Atoi(application.Labels["traefik.port"]) _, err := strconv.Atoi(application.Labels["traefik.port"])
if len(application.Ports) > 1 && err != nil { if len(application.Ports) > 1 && err != nil {
log.Debug("Filtering marathon task with more than 1 port and no traefik.port label", task.AppID) log.Debugf("Filtering marathon task %s with more than 1 port and no traefik.port label", task.AppID)
return false return false
} }
if application.Labels["traefik.enable"] == "false" { if application.Labels["traefik.enable"] == "false" {
log.Debug("Filtering disabled marathon task", task.AppID) log.Debugf("Filtering disabled marathon task %s", task.AppID)
return false return false
} }
//filter healthchecks
if application.HasHealthChecks() {
if task.HasHealthCheckResults() {
for _, healthcheck := range task.HealthCheckResult {
// found one bad healthcheck, return false
if !healthcheck.Alive {
log.Debugf("Filtering marathon task %s with bad healthcheck", task.AppID)
return false
}
}
} else {
log.Debugf("Filtering marathon task %s with bad healthcheck", task.AppID)
return false
}
}
return true return true
}, tasks.Tasks).([]marathon.Task) }, tasks.Tasks).([]marathon.Task)