mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7646 from andelf/fix-unix-socket-url

Browse Source 
*: fix a bug in handling unix socket urls
This commit is contained in:
Anthony Romano
2017-04-05 09:24:38 -07:00
committed by GitHub
parent 43f795a485 4f27981c46
commit d42c1f5131
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
embed/etcd.go
View File

@ -258,19 +258,21 @@ func startClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err error) {
}
proto := "tcp"
addr := u.Host
if u.Scheme == "unix" || u.Scheme == "unixs" {
proto = "unix"
addr = u.Host + u.Path
}
sctx.secure = u.Scheme == "https" || u.Scheme == "unixs"
sctx.insecure = !sctx.secure
if oldctx := sctxs[u.Host]; oldctx != nil {
if oldctx := sctxs[addr]; oldctx != nil {
oldctx.secure = oldctx.secure || sctx.secure
oldctx.insecure = oldctx.insecure || sctx.insecure
continue
}
if sctx.l, err = net.Listen(proto, u.Host); err != nil {
if sctx.l, err = net.Listen(proto, addr); err != nil {
return nil, err
}
@ -304,7 +306,7 @@ func startClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err error) {
if cfg.Debug {
sctx.registerTrace()
}
sctxs[u.Host] = sctx
sctxs[addr] = sctx
}
return sctxs, nil
}