homelab/traefik
1
0
Fork 0
Code Activity

Merge branch 'v1.3'

Browse source
This commit is contained in:
Fernandez Ludovic 2017-06-14 22:26:35 +02:00
commit 2a578748fd
4 changed files with 92 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
provider/eureka/eureka.go
View file

@ -8,9 +8,9 @@ import (
"time"
"github.com/ArthurHlt/go-eureka-client/eureka"
log "github.com/Sirupsen/logrus"
"github.com/cenk/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"

4
provider/marathon/marathon.go
View file

@ -167,13 +167,13 @@ func (p *Provider) loadMarathonConfig() *types.Configuration {
applications, err := p.marathonClient.Applications(nil)
if err != nil {
log.Errorf("Failed to create a client for marathon, error: %s", err)
log.Errorf("Failed to retrieve applications from Marathon, error: %s", err)
return nil
}
tasks, err := p.marathonClient.AllTasks(&marathon.AllTasksOpts{Status: "running"})
if err != nil {
log.Errorf("Failed to create a client for marathon, error: %s", err)
log.Errorf("Failed to retrieve task from Marathon, error: %s", err)
return nil
}