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

Merge branch 'master' into emilevauge-ghr-corrections

Browse source
This commit is contained in:
Emile Vauge 2015-10-08 19:24:38 +02:00
commit c03e2d4f44
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
marathon.go
View file

@ -112,6 +112,10 @@ func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
return false return false
} }
application := getApplication(task, applications.Apps) application := getApplication(task, applications.Apps)
if application == nil {
log.Errorf("Unable to get marathon application from task %s", task.AppID)
return false
}
_, 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.Debug("Filtering marathon task with more than 1 port and no traefik.port label", task.AppID)