Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: fix a bug in handling unix socket urls

Browse Source 
Now use url.Host + url.Path as unix socket path

Fixes #7644
This commit is contained in:
andelf 2017-04-01 22:30:41 +08:00
parent 512bac0ee9
commit 4f27981c46
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clientv3/client.go
View File

@ -184,6 +184,7 @@ func parseEndpoint(endpoint string) (proto string, host string, scheme string) {
case "http", "https":
case "unix":
proto = "unix"
host = url.Host + url.Path
default:
proto, host = "", ""
}

2
e2e/etcd_test.go
View File

@ -465,7 +465,7 @@ func (ep *etcdProcess) Stop() error {
<-ep.donec
if ep.cfg.purl.Scheme == "unix" || ep.cfg.purl.Scheme == "unixs" {
os.RemoveAll(ep.cfg.purl.Host)
os.Remove(ep.cfg.purl.Host + ep.cfg.purl.Path)
}
return nil
}

8
embed/etcd.go
View File

@ -257,19 +257,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
}
@ -303,7 +305,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
}

4
pkg/transport/unix_listener.go
View File

@ -22,7 +22,7 @@ import (
type unixListener struct{ net.Listener }
func NewUnixListener(addr string) (net.Listener, error) {
if err := os.RemoveAll(addr); err != nil {
if err := os.Remove(addr); err != nil && !os.IsNotExist(err) {
return nil, err
}
l, err := net.Listen("unix", addr)
@ -33,7 +33,7 @@ func NewUnixListener(addr string) (net.Listener, error) {
}
func (ul *unixListener) Close() error {
if err := os.RemoveAll(ul.Addr().String()); err != nil {
if err := os.Remove(ul.Addr().String()); err != nil && !os.IsNotExist(err) {
return err
}
return ul.Listener.Close()