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

Add healthcheck filter in marathon tasks

.dockerignore

@@ -0,0 +1,3 @@
+dist/
+vendor/
+!dist/traefik

Makefile

@@ -20,6 +20,9 @@ print-%: ; @echo $*=$($*)
 
 default: binary
 
+all: build
+	$(DOCKER_RUN_TRAEFIK) ./script/make.sh
+
 binary: build
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh generate binary
 

marathon.go

@@ -114,7 +114,7 @@ func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
 	//filter tasks
 	filteredTasks := fun.Filter(func(task marathon.Task) bool {
 		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
 		}
 		application, errApp := getApplication(task, applications.Apps)
@@ -124,13 +124,28 @@ func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
 		}
 		_, err := strconv.Atoi(application.Labels["traefik.port"])
 		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
 		}
 		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
 		}
+		//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
 	}, tasks.Tasks).([]marathon.Task)
 

script/make.sh

@@ -5,6 +5,7 @@ set -e
 DEFAULT_BUNDLES=(
 	validate-gofmt
 	validate-govet
+	generate
 	binary
 
 	test-unit