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

Fix Marathon backend

Browse source 
Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2016-04-19 12:00:22 +02:00
parent 68da47b59a
commit 2a3a34a80c
No known key found for this signature in database
GPG key ID: D808B4C167352E59
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/compose-marathon.yml
View file

@ -43,7 +43,7 @@ marathon:
command: --event_subscriber http_callback command: --event_subscriber http_callback
traefik: traefik:
image: traefik image: containous/traefik
command: -c /dev/null --web --logLevel=DEBUG --marathon --marathon.domain marathon.localhost --marathon.endpoint http://172.17.0.1:8080 --marathon.watch command: -c /dev/null --web --logLevel=DEBUG --marathon --marathon.domain marathon.localhost --marathon.endpoint http://172.17.0.1:8080 --marathon.watch
ports: ports:
- "8000:80" - "8000:80"

6
provider/marathon.go
View file

@ -69,6 +69,7 @@ func (provider *Marathon) Provide(configurationChan chan<- types.ConfigMessage,
return err return err
} }
pool.Go(func(stop chan bool) { pool.Go(func(stop chan bool) {
defer close(update)
for { for {
select { select {
case <-stop: case <-stop:
@ -86,6 +87,11 @@ func (provider *Marathon) Provide(configurationChan chan<- types.ConfigMessage,
} }
}) })
} }
configuration := provider.loadMarathonConfig()
configurationChan <- types.ConfigMessage{
ProviderName: "marathon",
Configuration: configuration,
}
return nil return nil
} }