mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
refactor utils.ParseHost with switch-case, so we can add other proto support easily
This commit is contained in:
parent
b0515a7016
commit
99f1675566
1 changed files with 12 additions and 5 deletions
|
@ -819,17 +819,24 @@ func StripComments(input []byte, commentMarker []byte) []byte {
|
|||
}
|
||||
|
||||
func ParseHost(host string, port int, addr string) string {
|
||||
if strings.HasPrefix(addr, "unix://") {
|
||||
var proto string
|
||||
switch {
|
||||
case strings.HasPrefix(addr, "unix://"):
|
||||
return addr
|
||||
}
|
||||
if strings.HasPrefix(addr, "tcp://") {
|
||||
case strings.HasPrefix(addr, "tcp://"):
|
||||
proto = "tcp"
|
||||
addr = strings.TrimPrefix(addr, "tcp://")
|
||||
default:
|
||||
if strings.Contains(addr, "://") {
|
||||
log.Fatal("Invalid bind address proto")
|
||||
}
|
||||
proto = "tcp"
|
||||
}
|
||||
|
||||
if strings.Contains(addr, ":") {
|
||||
hostParts := strings.Split(addr, ":")
|
||||
if len(hostParts) != 2 {
|
||||
log.Fatal("Invalid bind address format.")
|
||||
os.Exit(-1)
|
||||
}
|
||||
if hostParts[0] != "" {
|
||||
host = hostParts[0]
|
||||
|
@ -840,7 +847,7 @@ func ParseHost(host string, port int, addr string) string {
|
|||
} else {
|
||||
host = addr
|
||||
}
|
||||
return fmt.Sprintf("tcp://%s:%d", host, port)
|
||||
return fmt.Sprintf("%s://%s:%d", proto, host, port)
|
||||
}
|
||||
|
||||
func GetReleaseVersion() string {
|
||||
|
|
Loading…
Reference in a new issue