homelab/traefik
1
0
Fork 0
Code Activity

Merge v1.6.4 into master

Browse source
This commit is contained in:
Fernandez Ludovic 2018-06-15 17:58:20 +02:00
commit 586ba31120
28 changed files with 166 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
provider/mesos/config.go
View file

@ -3,6 +3,7 @@ package mesos
import (
"fmt"
"math"
"net"
"strconv"
"strings"
"text/template"
@ -237,7 +238,7 @@ func (p *Provider) getServers(tasks []taskData) map[string]types.Server {
serverName := "server-" + getID(task)
servers[serverName] = types.Server{
URL: fmt.Sprintf("%s://%s:%s", protocol, host, port),
URL: fmt.Sprintf("%s://%s", protocol, net.JoinHostPort(host, port)),
Weight: getIntValue(task.TraefikLabels, label.TraefikWeight, label.DefaultWeight, math.MaxInt32),
}
}