homelab/traefik
1
0
Fork 0
Code Activity

Fix sticky sessions Docker/Marathon labels

Browse source
This commit is contained in:
Emile Vauge 2016-09-28 13:28:20 +02:00
parent df225d9170
commit 291c3b6dbc
No known key found for this signature in database
GPG key ID: D808B4C167352E59
5 changed files with 64 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

20
provider/docker.go
View file

@ -261,26 +261,20 @@ func (provider *Docker) loadDockerConfig(containersInspected []dockerData) *type
return provider.containerFilter(container)
}, containersInspected).([]dockerData)
// sticky backends
stickycontainers := map[string][]dockerData{}
frontends := map[string][]dockerData{}
for _, container := range filteredContainers {
frontendName := provider.getFrontendName(container)
frontends[frontendName] = append(frontends[frontendName], container)
frontends[frontendName] = append(frontends[frontendName], container)
stickycontainers[provider.getBackend(container)] = container
}
templateObjects := struct {
Containers []dockerData
Frontends map[string][]dockerData
StickyContainers map[string][]dockerData
Domain string
Containers []dockerData
Frontends map[string][]dockerData
Domain string
}{
filteredContainers,
frontends,
stickycontainers,
provider.Domain,
}
@ -299,7 +293,9 @@ func (provider *Docker) hasCircuitBreakerLabel(container dockerData) bool {
}
func (provider *Docker) hasLoadBalancerLabel(container dockerData) bool {
if _, err := getLabel(container, "traefik.backend.loadbalancer.method"); err != nil {
_, errMethod := getLabel(container, "traefik.backend.loadbalancer.method")
_, errSticky := getLabel(container, "traefik.backend.loadbalancer.sticky")
if errMethod != nil && errSticky != nil {
return false
}
return true
@ -447,8 +443,8 @@ func (provider *Docker) getWeight(container dockerData) string {
return "1"
}
func (provider *Docker) getSticky(container dockertypes.ContainerJSON) string {
if _, err := getLabel(container, "traefik.stickysession"); err == nil {
func (provider *Docker) getSticky(container dockerData) string {
if _, err := getLabel(container, "traefik.backend.loadbalancer.sticky"); err == nil {
return "true"
}
return "false"