From 886965f5cd77b06719ea4ddcbbfc11d385bf21b5 Mon Sep 17 00:00:00 2001 From: liulei Date: Wed, 5 Jan 2022 15:04:43 +0800 Subject: [PATCH 1/3] add logger interface defination#153 --- dtmcli/logger/log.go | 18 ++++++++++++++++-- dtmcli/logger/logger_test.go | 12 ++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dtmcli/logger/log.go b/dtmcli/logger/log.go index 7d3650a..81466b3 100644 --- a/dtmcli/logger/log.go +++ b/dtmcli/logger/log.go @@ -8,13 +8,27 @@ import ( "go.uber.org/zap/zapcore" ) -var logger *zap.SugaredLogger = nil +//var logger *zap.SugaredLogger = nil + +var logger Logger = nil func init() { InitLog("info") } -// InitLog is a initialization for a logger +// Logger logger interface +type Logger interface { + Debugf(format string, args ...interface{}) + Infof(format string, args ...interface{}) + Warnf(format string, args ...interface{}) + Errorf(format string, args ...interface{}) +} + +func WithLogger(log Logger) { + logger = log +} + +// InitLog is an initialization for a logger // level can be: debug info warn error func InitLog(level string) { config := zap.NewProductionConfig() diff --git a/dtmcli/logger/logger_test.go b/dtmcli/logger/logger_test.go index 669a39f..6320b58 100644 --- a/dtmcli/logger/logger_test.go +++ b/dtmcli/logger/logger_test.go @@ -1,6 +1,7 @@ package logger import ( + "github.com/sirupsen/logrus" "os" "testing" ) @@ -15,3 +16,14 @@ func TestInitLog(t *testing.T) { FatalfIf(false, "nothing") FatalIfError(nil) } + +func TestWithLogger(t *testing.T) { + logger := logrus.New() + WithLogger(logger) + Debugf("a debug msg") + Infof("a info msg") + Warnf("a warn msg") + Errorf("a error msg") + FatalfIf(false, "nothing") + FatalIfError(nil) +} \ No newline at end of file From 1b44b6f77e264d87184a12835a18892b1a603fba Mon Sep 17 00:00:00 2001 From: liulei Date: Wed, 5 Jan 2022 15:16:09 +0800 Subject: [PATCH 2/3] chore: to correct comment and func name --- dtmsvr/config/config.go | 1 + dtmsvr/config/config_utils.go | 2 +- go.mod | 1 + go.sum | 1 + test/store_test.go | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dtmsvr/config/config.go b/dtmsvr/config/config.go index 5aad90f..80acd60 100644 --- a/dtmsvr/config/config.go +++ b/dtmsvr/config/config.go @@ -14,6 +14,7 @@ const ( Mysql = "mysql" Redis = "redis" BoltDb = "boltdb" + Postgres = "postgres" ) // MicroService config type for micro service diff --git a/dtmsvr/config/config_utils.go b/dtmsvr/config/config_utils.go index e5b1785..3d37b0c 100644 --- a/dtmsvr/config/config_utils.go +++ b/dtmsvr/config/config_utils.go @@ -65,7 +65,7 @@ func checkConfig(conf *configType) error { switch conf.Store.Driver { case BoltDb: return nil - case Mysql: + case Mysql, Postgres: if conf.Store.Host == "" { return errors.New("Db host not valid ") } diff --git a/go.mod b/go.mod index 306fad3..2a5fe3f 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( github.com/lithammer/shortuuid/v3 v3.0.7 github.com/onsi/gomega v1.16.0 github.com/prometheus/client_golang v1.11.0 + github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.0 go.etcd.io/bbolt v1.3.6 go.uber.org/atomic v1.9.0 // indirect diff --git a/go.sum b/go.sum index d37ef25..d67335c 100644 --- a/go.sum +++ b/go.sum @@ -476,6 +476,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= diff --git a/test/store_test.go b/test/store_test.go index 486b807..c2413f7 100644 --- a/test/store_test.go +++ b/test/store_test.go @@ -92,7 +92,7 @@ func TestStoreWait(t *testing.T) { registry.WaitStoreUp() } -func TestUpdateBranchSql(t *testing.T) { +func TestUpdateBranches(t *testing.T) { if !conf.Store.IsDB() { _, err := registry.GetStore().UpdateBranches(nil, nil) assert.Nil(t, err) From d2393b60c1d64cf963ca3066ff20c0d6d9c0103d Mon Sep 17 00:00:00 2001 From: liulei Date: Wed, 5 Jan 2022 15:28:41 +0800 Subject: [PATCH 3/3] remove logrus dep --- dtmcli/logger/logger_test.go | 4 ++-- go.mod | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dtmcli/logger/logger_test.go b/dtmcli/logger/logger_test.go index 6320b58..08f8b04 100644 --- a/dtmcli/logger/logger_test.go +++ b/dtmcli/logger/logger_test.go @@ -1,7 +1,7 @@ package logger import ( - "github.com/sirupsen/logrus" + "go.uber.org/zap" "os" "testing" ) @@ -18,7 +18,7 @@ func TestInitLog(t *testing.T) { } func TestWithLogger(t *testing.T) { - logger := logrus.New() + logger := zap.NewExample().Sugar() WithLogger(logger) Debugf("a debug msg") Infof("a info msg") diff --git a/go.mod b/go.mod index 2a5fe3f..306fad3 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,6 @@ require ( github.com/lithammer/shortuuid/v3 v3.0.7 github.com/onsi/gomega v1.16.0 github.com/prometheus/client_golang v1.11.0 - github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.0 go.etcd.io/bbolt v1.3.6 go.uber.org/atomic v1.9.0 // indirect