homelab/traefik
1
0
Fork 0
Code Activity

Fix regression on marathon backend

Browse source 
Signed-off-by: emile <emile@vauge.com>
This commit is contained in:
emile 2016-02-12 14:45:36 +01:00
parent 07c077cf94
commit c6c3af8099
No known key found for this signature in database
GPG key ID: D808B4C167352E59
4 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
provider/marathon.go
View file

@ -81,16 +81,17 @@ func (provider *Marathon) Provide(configurationChan chan<- types.ConfigMessage)
func (provider *Marathon) loadMarathonConfig() *types.Configuration {
var MarathonFuncMap = template.FuncMap{
"getBackend": provider.getBackend,
"getPort": provider.getPort,
"getWeight": provider.getWeight,
"getDomain": provider.getDomain,
"getProtocol": provider.getProtocol,
"getPassHostHeader": provider.getPassHostHeader,
"getEntryPoints": provider.getEntryPoints,
"getFrontendValue": provider.getFrontendValue,
"getFrontendRule": provider.getFrontendRule,
"replace": replace,
"getBackend": provider.getBackend,
"getPort": provider.getPort,
"getWeight": provider.getWeight,
"getDomain": provider.getDomain,
"getProtocol": provider.getProtocol,
"getPassHostHeader": provider.getPassHostHeader,
"getEntryPoints": provider.getEntryPoints,
"getFrontendValue": provider.getFrontendValue,
"getFrontendRule": provider.getFrontendRule,
"getFrontendBackend": provider.getFrontendBackend,
"replace": replace,
}
applications, err := provider.marathonClient.Applications(nil)
@ -313,7 +314,16 @@ func (provider *Marathon) getFrontendRule(application marathon.Application) stri
return "Host"
}
func (provider *Marathon) getBackend(application marathon.Application) string {
func (provider *Marathon) getBackend(task marathon.Task, applications []marathon.Application) string {
application, errApp := getApplication(task, applications)
if errApp != nil {
log.Errorf("Unable to get marathon application from task %s", task.AppID)
return ""
}
return provider.getFrontendBackend(application)
}
func (provider *Marathon) getFrontendBackend(application marathon.Application) string {
if label, err := provider.getLabel(application, "traefik.backend"); err == nil {
return label
}

2
provider/marathon_test.go
View file

@ -851,7 +851,7 @@ func TestMarathonGetBackend(t *testing.T) {
}
for _, a := range applications {
actual := provider.getBackend(a.application)
actual := provider.getFrontendBackend(a.application)
if actual != a.expected {
t.Fatalf("expected %q, got %q", a.expected, actual)
}