修复logger测试用例

Author: yumaojun03

file/fileinfo_test.go

@@ -1,4 +1,3 @@
-
 // +build !windows,!openbsd
 
 // Test for openbsd are excluded here as info.GID() returns 0 instead of the actual value
@@ -15,7 +14,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/infraboard/mcube/logger/zap/file"
+	"github.com/infraboard/mcube/file"
 )
 
 func TestStat(t *testing.T) {
@@ -76,4 +75,4 @@ func TestLstat(t *testing.T) {
 		t.Fatal(err)
 	}
 	assert.EqualValues(t, os.Getegid(), gid)
-}
+}

file/rotator.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/infraboard/mcube/logger"
 	"github.com/pkg/errors"
 )
 
@@ -61,7 +62,7 @@ type Rotator struct {
 
 // Logger allows the rotator to write debug information.
 type Logger interface {
-	Debugw(msg string, keysAndValues map[string]interface{}) // Debug
+	Debugw(msg string, fields ...logger.Field) // Debug
 }
 
 // RotatorOption is a configuration option for Rotator.
@@ -162,7 +163,7 @@ func NewFileRotator(filename string, options ...RotatorOption) (*Rotator, error)
 		"interval":       r.interval,
 	}
 	if r.log != nil {
-		r.log.Debugw("Initialized file rotator", meta)
+		r.log.Debugw("Initialized file rotator", logger.NewFieldsFromKV(meta)...)
 	}
 
 	return r, nil
@@ -431,7 +432,7 @@ func (r *Rotator) rotateByInterval(reason rotateReason) error {
 		"reason":   reason,
 	}
 	if r.log != nil {
-		r.log.Debugw("Rotating file", meta)
+		r.log.Debugw("Rotating file", logger.NewFieldsFromKV(meta)...)
 	}
 
 	r.intervalRotator.Rotate()
@@ -462,7 +463,7 @@ func (r *Rotator) rotateBySize(reason rotateReason) error {
 					"filename": old,
 					"reason":   reason,
 				}
-				r.log.Debugw("Rotating file", meta)
+				r.log.Debugw("Rotating file", logger.NewFieldsFromKV(meta)...)
 			}
 		}
 	}

file/rotator_test.go

@@ -11,8 +11,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/infraboard/mcube/logger/zap"
 	"github.com/infraboard/mcube/file"
+	"github.com/infraboard/mcube/logger"
+	"github.com/infraboard/mcube/logger/zap"
 )
 
 const logMessage = "Test file rotator.\n"
@@ -27,13 +28,15 @@ func TestFileRotator(t *testing.T) {
 	defer os.RemoveAll(dir)
 
 	filename := filepath.Join(dir, "sample.log")
+	debugL := zap.NewLogger("rotator").With(logger.NewAny("key", "rotate"))
 	r, err := file.NewFileRotator(filename,
 		file.MaxBackups(2),
-		file.WithLogger(zap.NewLogger("rotator").With(map[string]interface{}{"key": "rotate"})),
+		file.WithLogger(debugL),
 	)
 	if err != nil {
 		t.Fatal(err)
 	}
+
 	defer r.Close()
 
 	WriteMsg(t, r)

go.mod

@@ -7,10 +7,10 @@ require (
 	github.com/coreos/bbolt v1.3.3 // indirect
 	github.com/coreos/etcd v3.3.18+incompatible // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/go-redis/redis v6.15.6+incompatible
-	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
 	github.com/google/btree v1.0.0 // indirect
@@ -21,8 +21,6 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.12.1 // indirect
 	github.com/jonboulle/clockwork v0.1.0 // indirect
 	github.com/julienschmidt/httprouter v1.3.0
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/onsi/ginkgo v1.11.0 // indirect
 	github.com/onsi/gomega v1.8.1 // indirect
 	github.com/pkg/errors v0.8.1

go.sum

@@ -22,6 +22,8 @@ github.com/coreos/etcd v3.3.18+incompatible h1:Zz1aXgDrFFi1nadh58tA9ktt06cmPTwNN
 github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
+github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=