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

use filepath

Browse Source
This commit is contained in:
Fabrizio (Misto) Milo 2013-08-12 17:10:04 -07:00
parent 21c658b151
commit ddc53c6584
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcd.go
View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"path/filepath"
"bytes" "bytes"
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
@ -517,13 +518,13 @@ func parseInfo(path string) *Info {
func getInfo(path string) *Info { func getInfo(path string) *Info {
// Read in the server info if available. // Read in the server info if available.
infoPath := fmt.Sprintf("%s/info", path) infoPath := filepath.Join(path, "info")
// Delete the old configuration if exist // Delete the old configuration if exist
if force { if force {
logPath := fmt.Sprintf("%s/log", path) logPath := filepath.Join(path, "log")
confPath := fmt.Sprintf("%s/conf", path) confPath := filepath.Join(path, "conf")
snapshotPath := fmt.Sprintf("%s/snapshot", path) snapshotPath := filepath.Join(path, "snapshot")
os.Remove(infoPath) os.Remove(infoPath)
os.Remove(logPath) os.Remove(logPath)
os.Remove(confPath) os.Remove(confPath)