diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index 30d8e032a..fbde067ad 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -218,16 +218,9 @@ func startProxy(cfg *config) error { } cfg.ec.Dir = filepath.Join(cfg.ec.Dir, "proxy") - if fileutil.Exist(cfg.ec.Dir) { - err := fileutil.CheckDirPermission(cfg.ec.Dir, fileutil.PrivateDirMode) - if err != nil { - return err - } - } else { - err = os.MkdirAll(cfg.ec.Dir, fileutil.PrivateDirMode) - if err != nil { - return err - } + err = fileutil.TouchDirAll(cfg.ec.Dir) + if err != nil { + return err } var peerURLs []string diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go index 1e31d28db..412c3c2a6 100644 --- a/pkg/transport/listener.go +++ b/pkg/transport/listener.go @@ -102,15 +102,9 @@ func (info TLSInfo) Empty() bool { } func SelfCert(dirpath string, hosts []string, additionalUsages ...x509.ExtKeyUsage) (info TLSInfo, err error) { - if fileutil.Exist(dirpath) { - err = fileutil.CheckDirPermission(dirpath, fileutil.PrivateDirMode) - if err != nil { - return - } - } else { - if err = os.MkdirAll(dirpath, fileutil.PrivateDirMode); err != nil { - return - } + err = fileutil.TouchDirAll(dirpath) + if err != nil { + return } certPath := filepath.Join(dirpath, "cert.pem")