Skip to content

Commit

Permalink
etcd-dump-logs: use filepath for files
Browse files Browse the repository at this point in the history
  • Loading branch information
heyitsanthony committed Mar 16, 2017
1 parent af368af commit f62c7c2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tools/etcd-dump-logs/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"flag"
"fmt"
"log"
"path"
"path/filepath"
"time"

"github.com/coreos/etcd/etcdserver/etcdserverpb"
Expand Down Expand Up @@ -58,7 +58,7 @@ func main() {
ss := snap.New(snapDir(*from))
snapshot, err = ss.Load()
} else {
snapshot, err = snap.Read(path.Join(snapDir(*from), *snapfile))
snapshot, err = snap.Read(filepath.Join(snapDir(*from), *snapfile))
}

switch err {
Expand Down Expand Up @@ -132,9 +132,9 @@ func main() {
}
}

func walDir(dataDir string) string { return path.Join(dataDir, "member", "wal") }
func walDir(dataDir string) string { return filepath.Join(dataDir, "member", "wal") }

func snapDir(dataDir string) string { return path.Join(dataDir, "member", "snap") }
func snapDir(dataDir string) string { return filepath.Join(dataDir, "member", "snap") }

func parseWALMetadata(b []byte) (id, cid types.ID) {
var metadata etcdserverpb.Metadata
Expand Down

0 comments on commit f62c7c2

Please sign in to comment.