Use net.JoinHostPort for servers URL

This commit is contained in:
Ludovic Fernandez 2018-06-13 10:08:03 +02:00 committed by Traefiker Bot
parent 2e95832812
commit b59276ff1c
5 changed files with 10 additions and 5 deletions

View file

@ -3,6 +3,7 @@ package docker
import ( import (
"context" "context"
"fmt" "fmt"
"net"
"strconv" "strconv"
"strings" "strings"
"text/template" "text/template"
@ -336,7 +337,7 @@ func (p *Provider) getServers(containers []dockerData) map[string]types.Server {
} }
servers[provider.Normalize(serverName)] = types.Server{ servers[provider.Normalize(serverName)] = types.Server{
URL: fmt.Sprintf("%s://%s:%s", protocol, ip, port), URL: fmt.Sprintf("%s://%s", protocol, net.JoinHostPort(ip, port)),
Weight: label.GetIntValue(container.SegmentLabels, label.TraefikWeight, label.DefaultWeight), Weight: label.GetIntValue(container.SegmentLabels, label.TraefikWeight, label.DefaultWeight),
} }
} }

View file

@ -2,6 +2,7 @@ package ecs
import ( import (
"fmt" "fmt"
"net"
"strconv" "strconv"
"strings" "strings"
"text/template" "text/template"
@ -134,7 +135,7 @@ func getServers(instances []ecsInstance) map[string]types.Server {
serverName := provider.Normalize(fmt.Sprintf("server-%s-%s", instance.Name, instance.ID)) serverName := provider.Normalize(fmt.Sprintf("server-%s-%s", instance.Name, instance.ID))
servers[serverName] = types.Server{ servers[serverName] = types.Server{
URL: fmt.Sprintf("%s://%s:%s", protocol, host, port), URL: fmt.Sprintf("%s://%s", protocol, net.JoinHostPort(host, port)),
Weight: label.GetIntValue(instance.TraefikLabels, label.TraefikWeight, label.DefaultWeight), Weight: label.GetIntValue(instance.TraefikLabels, label.TraefikWeight, label.DefaultWeight),
} }
} }

View file

@ -4,6 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"math" "math"
"net"
"strconv" "strconv"
"strings" "strings"
"text/template" "text/template"
@ -340,7 +341,7 @@ func (p *Provider) getServer(app appData, task marathon.Task) (string, *types.Se
serverName := provider.Normalize("server-" + app.ID + "-" + task.ID + getSegmentNameSuffix(app.SegmentName)) serverName := provider.Normalize("server-" + app.ID + "-" + task.ID + getSegmentNameSuffix(app.SegmentName))
return serverName, &types.Server{ return serverName, &types.Server{
URL: fmt.Sprintf("%s://%s:%v", protocol, host, port), URL: fmt.Sprintf("%s://%s", protocol, net.JoinHostPort(host, port)),
Weight: label.GetIntValue(app.SegmentLabels, label.TraefikWeight, label.DefaultWeight), Weight: label.GetIntValue(app.SegmentLabels, label.TraefikWeight, label.DefaultWeight),
}, nil }, nil
} }

View file

@ -3,6 +3,7 @@ package mesos
import ( import (
"fmt" "fmt"
"math" "math"
"net"
"strconv" "strconv"
"strings" "strings"
"text/template" "text/template"
@ -185,7 +186,7 @@ func (p *Provider) getServers(tasks []taskData) map[string]types.Server {
serverName := "server-" + getID(task) serverName := "server-" + getID(task)
servers[serverName] = types.Server{ 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), Weight: getIntValue(task.TraefikLabels, label.TraefikWeight, label.DefaultWeight, math.MaxInt32),
} }
} }

View file

@ -2,6 +2,7 @@ package rancher
import ( import (
"fmt" "fmt"
"net"
"strconv" "strconv"
"strings" "strings"
"text/template" "text/template"
@ -181,7 +182,7 @@ func getServers(service rancherData) map[string]types.Server {
serverName := "server-" + strconv.Itoa(index) serverName := "server-" + strconv.Itoa(index)
servers[serverName] = types.Server{ servers[serverName] = types.Server{
URL: fmt.Sprintf("%s://%s:%s", protocol, ip, port), URL: fmt.Sprintf("%s://%s", protocol, net.JoinHostPort(ip, port)),
Weight: weight, Weight: weight,
} }
} }