*: rename logger to plog

snap/snapshotter.go

@@ -38,7 +38,7 @@ const (
 )
 
 var (
-	logger = capnslog.NewPackageLogger("github.com/coreos/etcd", "snap")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "snap")
 
 	ErrNoSnapshot    = errors.New("snap: no available snapshot")
 	ErrEmptySnapshot = errors.New("snap: empty snapshot")
@@ -111,30 +111,30 @@ func loadSnap(dir, name string) (*raftpb.Snapshot, error) {
 func Read(snapname string) (*raftpb.Snapshot, error) {
 	b, err := ioutil.ReadFile(snapname)
 	if err != nil {
-		logger.Errorf("cannot read file %v: %v", snapname, err)
+		plog.Errorf("cannot read file %v: %v", snapname, err)
 		return nil, err
 	}
 
 	var serializedSnap snappb.Snapshot
 	if err = serializedSnap.Unmarshal(b); err != nil {
-		logger.Errorf("corrupted snapshot file %v: %v", snapname, err)
+		plog.Errorf("corrupted snapshot file %v: %v", snapname, err)
 		return nil, err
 	}
 
 	if len(serializedSnap.Data) == 0 || serializedSnap.Crc == 0 {
-		logger.Errorf("unexpected empty snapshot")
+		plog.Errorf("unexpected empty snapshot")
 		return nil, ErrEmptySnapshot
 	}
 
 	crc := crc32.Update(0, crcTable, serializedSnap.Data)
 	if crc != serializedSnap.Crc {
-		logger.Errorf("corrupted snapshot file %v: crc mismatch", snapname)
+		plog.Errorf("corrupted snapshot file %v: crc mismatch", snapname)
 		return nil, ErrCRCMismatch
 	}
 
 	var snap raftpb.Snapshot
 	if err = snap.Unmarshal(serializedSnap.Data); err != nil {
-		logger.Errorf("corrupted snapshot file %v: %v", snapname, err)
+		plog.Errorf("corrupted snapshot file %v: %v", snapname, err)
 		return nil, err
 	}
 	return &snap, nil
@@ -166,7 +166,7 @@ func checkSuffix(names []string) []string {
 		if strings.HasSuffix(names[i], snapSuffix) {
 			snaps = append(snaps, names[i])
 		} else {
-			logger.Warningf("skipped unexpected non snapshot file %v", names[i])
+			plog.Warningf("skipped unexpected non snapshot file %v", names[i])
 		}
 	}
 	return snaps
@@ -175,6 +175,6 @@ func checkSuffix(names []string) []string {
 func renameBroken(path string) {
 	brokenPath := path + ".broken"
 	if err := os.Rename(path, brokenPath); err != nil {
-		logger.Warningf("cannot rename broken snapshot file %v to %v: %v", path, brokenPath, err)
+		plog.Warningf("cannot rename broken snapshot file %v to %v: %v", path, brokenPath, err)
 	}
 }

wal/util.go

@@ -42,7 +42,7 @@ func searchIndex(names []string, index uint64) (int, bool) {
 		name := names[i]
 		_, curIndex, err := parseWalName(name)
 		if err != nil {
-			logger.Panicf("parse correct name should never fail: %v", err)
+			plog.Panicf("parse correct name should never fail: %v", err)
 		}
 		if index >= curIndex {
 			return i, true
@@ -58,7 +58,7 @@ func isValidSeq(names []string) bool {
 	for _, name := range names {
 		curSeq, _, err := parseWalName(name)
 		if err != nil {
-			logger.Panicf("parse correct name should never fail: %v", err)
+			plog.Panicf("parse correct name should never fail: %v", err)
 		}
 		if lastSeq != 0 && lastSeq != curSeq-1 {
 			return false
@@ -72,7 +72,7 @@ func checkWalNames(names []string) []string {
 	wnames := make([]string, 0)
 	for _, name := range names {
 		if _, _, err := parseWalName(name); err != nil {
-			logger.Warningf("ignored file %v in wal", name)
+			plog.Warningf("ignored file %v in wal", name)
 			continue
 		}
 		wnames = append(wnames, name)

wal/wal.go

@@ -50,7 +50,7 @@ const (
 )
 
 var (
-	logger = capnslog.NewPackageLogger("github.com/coreos/etcd", "wal")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "wal")
 
 	ErrMetadataConflict = errors.New("wal: conflicting metadata found")
 	ErrFileNotFound     = errors.New("wal: file not found")
@@ -175,7 +175,7 @@ func openAtIndex(dirpath string, snap walpb.Snapshot, all bool) (*WAL, error) {
 			if all {
 				return nil, err
 			} else {
-				logger.Warningf("opened all the files until %s, since it is still in use by an etcd server", name)
+				plog.Warningf("opened all the files until %s, since it is still in use by an etcd server", name)
 				break
 			}
 		}
@@ -356,7 +356,7 @@ func (w *WAL) cut() error {
 	// increase the wal seq
 	w.seq++
 
-	logger.Infof("segmented wal file %v is created", fpath)
+	plog.Infof("segmented wal file %v is created", fpath)
 	return nil
 }