From dad3909085bebe7844566f055edbb9712f172bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Wed, 26 Oct 2022 14:53:17 +0800 Subject: [PATCH 1/7] chore: improve log mod name --- pkg/client/grpc/config.go | 2 +- pkg/client/resty/resty.go | 5 +++-- pkg/client/rocketmq/init.go | 22 ++++++++++++++-------- pkg/core/ecode/unified.go | 21 +++++++++++++++++++-- pkg/server/xecho/config.go | 5 +---- pkg/server/xgrpc/config.go | 2 +- 6 files changed, 39 insertions(+), 18 deletions(-) diff --git a/pkg/client/grpc/config.go b/pkg/client/grpc/config.go index 0147d5fd1a..16e67714d0 100644 --- a/pkg/client/grpc/config.go +++ b/pkg/client/grpc/config.go @@ -58,7 +58,7 @@ func DefaultConfig() *Config { dialOptions: []grpc.DialOption{ grpc.WithInsecure(), }, - logger: xlog.Jupiter(), + logger: xlog.Jupiter().Named(ecode.ModClientGrpc), BalancerName: roundrobin.Name, // round robin by default DialTimeout: cast.ToDuration("3s"), ReadTimeout: cast.ToDuration("1s"), diff --git a/pkg/client/resty/resty.go b/pkg/client/resty/resty.go index 8850416c7e..3c18d08308 100644 --- a/pkg/client/resty/resty.go +++ b/pkg/client/resty/resty.go @@ -23,6 +23,7 @@ import ( "github.com/alibaba/sentinel-golang/core/base" "github.com/douyu/jupiter/pkg/conf" "github.com/douyu/jupiter/pkg/core/constant" + "github.com/douyu/jupiter/pkg/core/ecode" "github.com/douyu/jupiter/pkg/core/metric" "github.com/douyu/jupiter/pkg/core/sentinel" "github.com/douyu/jupiter/pkg/core/xtrace" @@ -110,7 +111,7 @@ func DefaultConfig() *Config { Timeout: cast.ToDuration("3000ms"), EnableAccessLog: false, EnableSentinel: true, - logger: xlog.Jupiter().With(xlog.FieldMod("resty")), + logger: xlog.Jupiter().Named(ecode.ModeClientResty), } } @@ -235,7 +236,7 @@ func (config *Config) Build() (*resty.Client, error) { func (c *Config) MustBuild() *resty.Client { cc, err := c.Build() if err != nil { - xlog.Jupiter().Panic("resty build failed", zap.Error(err), zap.Any("config", c)) + c.logger.Panic("resty build failed", zap.Error(err), zap.Any("config", c)) } return cc diff --git a/pkg/client/rocketmq/init.go b/pkg/client/rocketmq/init.go index 121e7cef32..a33af2f39e 100644 --- a/pkg/client/rocketmq/init.go +++ b/pkg/client/rocketmq/init.go @@ -21,18 +21,24 @@ import ( "github.com/apache/rocketmq-client-go/v2/primitive" "github.com/apache/rocketmq-client-go/v2/rlog" + "github.com/douyu/jupiter/pkg/conf" + "github.com/douyu/jupiter/pkg/core/ecode" "github.com/douyu/jupiter/pkg/xlog" "go.uber.org/zap" ) func init() { - rlog.SetLogLevel("debug") - rlog.SetLogger(&mqLogger{xlog.Jupiter()}) + conf.OnLoaded(func(c *conf.Configuration) { + logger := xlog.Jupiter().Named(ecode.ModeClientRocketMQ) - primitive.PanicHandler = func(i interface{}) { - stack := make([]byte, 1024) - length := runtime.Stack(stack, true) - fmt.Fprint(os.Stderr, "[rocketmq panic recovery]\n", string(stack[:length])) - xlog.Jupiter().Error("rocketmq panic recovery", zap.Any("error", i)) - } + rlog.SetLogLevel("debug") + rlog.SetLogger(&mqLogger{logger.WithOptions(zap.AddCallerSkip(2))}) + + primitive.PanicHandler = func(i interface{}) { + stack := make([]byte, 1024) + length := runtime.Stack(stack, true) + fmt.Fprint(os.Stderr, "[rocketmq panic recovery]\n", string(stack[:length])) + logger.Error("rocketmq panic recovery", zap.Any("error", i)) + } + }) } diff --git a/pkg/core/ecode/unified.go b/pkg/core/ecode/unified.go index 92a077be15..848cc4f037 100644 --- a/pkg/core/ecode/unified.go +++ b/pkg/core/ecode/unified.go @@ -109,16 +109,33 @@ const ( ModApp = "app" // ModProc ... ModProc = "proc" + // ModGrpcServer ... ModGrpcServer = "server.grpc" + // ModHTTPServer ... + ModEchoServer = "server.echo" + + ModCacheFreecache = "cache.freecache" + // ModRegistryETCD ... ModRegistryETCD = "registry.etcd" + // ModClientETCD ... ModClientETCD = "client.etcd" // ModClientGrpc ... ModClientGrpc = "client.grpc" - // ModClientMySQL ... - ModClientMySQL = "client.mysql" + // ModeClientRocketMQ ... + ModeClientRocketMQ = "client.rocketmq" + // ModClientRedis ... + ModClientRedis = "client.redis" + // ModeClientResty ... + ModeClientResty = "client.resty" + + // ModStoreMySQL ... + ModStoreMySQL = "store.mysql" + // ModClientMongo ... + ModClientMongo = "store.mongo" + // ModXcronETCD ... ModXcronETCD = "xcron.etcd" ) diff --git a/pkg/server/xecho/config.go b/pkg/server/xecho/config.go index 58e35cd5a7..f4ee62d8c5 100644 --- a/pkg/server/xecho/config.go +++ b/pkg/server/xecho/config.go @@ -26,9 +26,6 @@ import ( "go.uber.org/zap" ) -//ModName named a mod -const ModName = "server.echo" - //Config HTTP config type Config struct { Host string @@ -56,7 +53,7 @@ func DefaultConfig() *Config { Debug: false, Deployment: constant.DefaultDeployment, SlowQueryThresholdInMilli: 500, // 500ms - logger: xlog.Jupiter().With(xlog.FieldMod(ModName)), + logger: xlog.Jupiter().Named(ecode.ModEchoServer), EnableTLS: false, CertFile: "cert.pem", PrivateFile: "private.pem", diff --git a/pkg/server/xgrpc/config.go b/pkg/server/xgrpc/config.go index d84191c301..0051d5cc6e 100644 --- a/pkg/server/xgrpc/config.go +++ b/pkg/server/xgrpc/config.go @@ -95,7 +95,7 @@ func DefaultConfig() *Config { DisableTrace: false, EnableTLS: false, SlowQueryThresholdInMilli: 500, - logger: xlog.Jupiter().With(xlog.FieldMod("server.grpc")), + logger: xlog.Jupiter().Named(ecode.ModGrpcServer), serverOptions: []grpc.ServerOption{}, streamInterceptors: []grpc.StreamServerInterceptor{}, unaryInterceptors: []grpc.UnaryServerInterceptor{}, From 3d0668a4572b2f255498030b776ad88ef2260cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Wed, 26 Oct 2022 14:57:47 +0800 Subject: [PATCH 2/7] update --- pkg/client/redisgo/config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/client/redisgo/config.go b/pkg/client/redisgo/config.go index 7578e517a0..c329a2693a 100644 --- a/pkg/client/redisgo/config.go +++ b/pkg/client/redisgo/config.go @@ -9,6 +9,7 @@ import ( cfg "github.com/douyu/jupiter/pkg/conf" "github.com/douyu/jupiter/pkg/core/constant" + "github.com/douyu/jupiter/pkg/core/ecode" "github.com/douyu/jupiter/pkg/util/xdebug" "github.com/douyu/jupiter/pkg/xlog" ) @@ -87,7 +88,7 @@ func DefaultConfig() *Config { EnableMetricInterceptor: true, EnableTraceInterceptor: true, SlowLogThreshold: cast.ToDuration("250ms"), - logger: xlog.Jupiter().With(xlog.FieldMod("redigo")), + logger: xlog.Jupiter().Named(ecode.ModClientRedis), OnDialError: "panic", } } From e8dd4ab61d1860972d48673119ea79273ee78e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Wed, 26 Oct 2022 15:17:44 +0800 Subject: [PATCH 3/7] fix data race --- pkg/client/rocketmq/init.go | 4 - pkg/core/application/application.go | 9 ++- pkg/core/rocketmq/log.go | 116 ++++++++++++++++++++++++++++ pkg/core/xgrpclog/logger.go | 3 +- 4 files changed, 125 insertions(+), 7 deletions(-) create mode 100644 pkg/core/rocketmq/log.go diff --git a/pkg/client/rocketmq/init.go b/pkg/client/rocketmq/init.go index a33af2f39e..c2766ee512 100644 --- a/pkg/client/rocketmq/init.go +++ b/pkg/client/rocketmq/init.go @@ -20,7 +20,6 @@ import ( "runtime" "github.com/apache/rocketmq-client-go/v2/primitive" - "github.com/apache/rocketmq-client-go/v2/rlog" "github.com/douyu/jupiter/pkg/conf" "github.com/douyu/jupiter/pkg/core/ecode" "github.com/douyu/jupiter/pkg/xlog" @@ -31,9 +30,6 @@ func init() { conf.OnLoaded(func(c *conf.Configuration) { logger := xlog.Jupiter().Named(ecode.ModeClientRocketMQ) - rlog.SetLogLevel("debug") - rlog.SetLogger(&mqLogger{logger.WithOptions(zap.AddCallerSkip(2))}) - primitive.PanicHandler = func(i interface{}) { stack := make([]byte, 1024) length := runtime.Stack(stack, true) diff --git a/pkg/core/application/application.go b/pkg/core/application/application.go index 000c00b9ac..7697186b24 100644 --- a/pkg/core/application/application.go +++ b/pkg/core/application/application.go @@ -32,6 +32,7 @@ import ( "github.com/douyu/jupiter/pkg/core/ecode" "github.com/douyu/jupiter/pkg/core/executor" "github.com/douyu/jupiter/pkg/core/hooks" + "github.com/douyu/jupiter/pkg/core/rocketmq" "github.com/douyu/jupiter/pkg/core/signals" "github.com/douyu/jupiter/pkg/core/xgrpclog" "github.com/douyu/jupiter/pkg/flag" @@ -110,11 +111,15 @@ func (app *Application) initialize() { _ = app.parseFlags() _ = app.printBanner() - - xgrpclog.SetLogger(xlog.Jupiter()) + app.initLogger() }) } +func (app *Application) initLogger() { + xgrpclog.SetLogger(xlog.Jupiter()) + rocketmq.SetLogger(xlog.Jupiter()) +} + // // start up application // // By default the startup composition is: // // - parse config, watch, version flags diff --git a/pkg/core/rocketmq/log.go b/pkg/core/rocketmq/log.go new file mode 100644 index 0000000000..4e78571b72 --- /dev/null +++ b/pkg/core/rocketmq/log.go @@ -0,0 +1,116 @@ +// Copyright 2022 Douyu +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package rocketmq + +import ( + "github.com/apache/rocketmq-client-go/v2/rlog" + "github.com/douyu/jupiter/pkg/core/ecode" + "go.uber.org/zap" +) + +type mqLogger struct { + logger *zap.Logger +} + +const ( + defaultCallerSkip = 2 +) + +func SetLogger(logger *zap.Logger) { + rlog.SetLogLevel("debug") + rlog.SetLogger(&mqLogger{ + logger: logger.Named(ecode.ModeClientRocketMQ). + WithOptions(zap.AddCallerSkip(defaultCallerSkip)), + }) +} + +func (l *mqLogger) Debug(msg string, fields map[string]interface{}) { + if msg == "" && len(fields) == 0 { + return + } + + fs := make([]zap.Field, 0, len(fields)) + + for key, value := range fields { + fs = append(fs, zap.Any(key, value)) + } + + l.logger.Debug(msg, fs...) +} + +func (l *mqLogger) Info(msg string, fields map[string]interface{}) { + if msg == "" && len(fields) == 0 { + return + } + + fs := make([]zap.Field, 0, len(fields)) + + for key, value := range fields { + fs = append(fs, zap.Any(key, value)) + } + + // Here we reguard the info level as debug level + l.logger.Debug(msg, fs...) +} + +func (l *mqLogger) Warning(msg string, fields map[string]interface{}) { + if msg == "" && len(fields) == 0 { + return + } + + fs := make([]zap.Field, 0, len(fields)) + + for key, value := range fields { + fs = append(fs, zap.Any(key, value)) + } + + l.logger.Warn(msg, fs...) +} + +func (l *mqLogger) Error(msg string, fields map[string]interface{}) { + if msg == "" && len(fields) == 0 { + return + } + + fs := make([]zap.Field, 0, len(fields)) + + for key, value := range fields { + fs = append(fs, zap.Any(key, value)) + } + + l.logger.Error(msg, fs...) +} + +func (l *mqLogger) Fatal(msg string, fields map[string]interface{}) { + if msg == "" && len(fields) == 0 { + return + } + + fs := make([]zap.Field, 0, len(fields)) + + for key, value := range fields { + fs = append(fs, zap.Any(key, value)) + } + + l.logger.Fatal(msg, fs...) +} + +func (l *mqLogger) Level(level string) { + +} + +func (l *mqLogger) OutputPath(path string) (err error) { + return nil +} diff --git a/pkg/core/xgrpclog/logger.go b/pkg/core/xgrpclog/logger.go index d5c4440992..4d98b86e6e 100644 --- a/pkg/core/xgrpclog/logger.go +++ b/pkg/core/xgrpclog/logger.go @@ -3,6 +3,7 @@ package xgrpclog import ( "fmt" + "github.com/douyu/jupiter/pkg/core/ecode" "github.com/douyu/jupiter/pkg/xlog" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -30,7 +31,7 @@ var ( // SetLogger sets loggerWrapper to grpclog func SetLogger(logger *xlog.Logger) { - logger = logger.WithOptions(zap.AddCallerSkip(defaultCallerSkip)) + logger = logger.Named(ecode.ModClientGrpc).WithOptions(zap.AddCallerSkip(defaultCallerSkip)) grpclog.SetLoggerV2(&loggerWrapper{logger: logger, sugar: logger.Sugar()}) } From e97aeae61e2e69d12f977d365ea99befefa09027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Wed, 26 Oct 2022 15:29:53 +0800 Subject: [PATCH 4/7] update --- pkg/core/ecode/unified.go | 4 ++-- pkg/registry/etcdv3/config.go | 2 +- pkg/registry/etcdv3/registry.go | 6 +++--- pkg/store/mongox/init.go | 3 --- pkg/store/mongox/mongo.go | 6 +++--- pkg/store/mongox/option.go | 6 ++++++ 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkg/core/ecode/unified.go b/pkg/core/ecode/unified.go index 848cc4f037..2436622229 100644 --- a/pkg/core/ecode/unified.go +++ b/pkg/core/ecode/unified.go @@ -133,8 +133,8 @@ const ( // ModStoreMySQL ... ModStoreMySQL = "store.mysql" - // ModClientMongo ... - ModClientMongo = "store.mongo" + // ModStoreMongo ... + ModStoreMongo = "store.mongo" // ModXcronETCD ... ModXcronETCD = "xcron.etcd" diff --git a/pkg/registry/etcdv3/config.go b/pkg/registry/etcdv3/config.go index 6df57676b6..3a06fb0e17 100644 --- a/pkg/registry/etcdv3/config.go +++ b/pkg/registry/etcdv3/config.go @@ -53,7 +53,7 @@ func DefaultConfig() *Config { Config: etcdv3.DefaultConfig(), ReadTimeout: time.Second * 3, Prefix: "wsd-reg", - logger: xlog.Jupiter(), + logger: xlog.Jupiter().Named(ecode.ModRegistryETCD), ServiceTTL: cast.ToDuration("60s"), } } diff --git a/pkg/registry/etcdv3/registry.go b/pkg/registry/etcdv3/registry.go index 58e16c5477..4261cd88a9 100644 --- a/pkg/registry/etcdv3/registry.go +++ b/pkg/registry/etcdv3/registry.go @@ -59,9 +59,9 @@ var _ registry.Registry = new(etcdv3Registry) func newETCDRegistry(config *Config) (*etcdv3Registry, error) { if config.logger == nil { - config.logger = xlog.Jupiter() + config.logger = xlog.Jupiter().Named(ecode.ModRegistryETCD) } - config.logger = config.logger.With(xlog.FieldMod(ecode.ModRegistryETCD), xlog.FieldAddrAny(config.Config.Endpoints)) + config.logger = config.logger.With(xlog.FieldAddrAny(config.Config.Endpoints)) etcdv3Client, err := config.Config.Singleton() if err != nil { config.logger.Error("create etcdv3 client", xlog.FieldErrKind(ecode.ErrKindRequestErr), xlog.FieldErr(err)) @@ -164,7 +164,7 @@ func (reg *etcdv3Registry) WatchServices(ctx context.Context, prefix string) (ch // case addresses <- snapshot: case addresses <- *out: default: - xlog.Jupiter().Warn("invalid") + reg.logger.Warn("invalid event") } } }) diff --git a/pkg/store/mongox/init.go b/pkg/store/mongox/init.go index 88e76292b1..779a8fbcc0 100644 --- a/pkg/store/mongox/init.go +++ b/pkg/store/mongox/init.go @@ -4,7 +4,6 @@ import ( "net/http" "github.com/douyu/jupiter/pkg/core/application" - "github.com/douyu/jupiter/pkg/xlog" jsoniter "github.com/json-iterator/go" "go.mongodb.org/mongo-driver/mongo" ) @@ -31,5 +30,3 @@ func init() { _ = jsoniter.NewEncoder(w).Encode(rets) }) } - -var _logger = xlog.Jupiter().With(xlog.FieldMod("mongodb")) diff --git a/pkg/store/mongox/mongo.go b/pkg/store/mongox/mongo.go index 6f33dff1d0..39b1e8f696 100644 --- a/pkg/store/mongox/mongo.go +++ b/pkg/store/mongox/mongo.go @@ -28,7 +28,7 @@ func newSession(config *Config) *mongo.Client { clientOpts.SocketTimeout = &config.SocketTimeout client, err := mongo.Connect(context.Background(), clientOpts.ApplyURI(config.DSN)) if err != nil { - _logger.Panic("dial mongo", xlog.FieldAddr(config.DSN), xlog.Any("error", err)) + config.logger.Panic("dial mongo", xlog.FieldAddr(config.DSN), xlog.Any("error", err)) } _instances.Store(config.Name, client) @@ -37,10 +37,10 @@ func newSession(config *Config) *mongo.Client { func isConfigErr(config *Config) { if config.SocketTimeout == time.Duration(0) { - _logger.Panic("invalid config", xlog.FieldExtMessage("socketTimeout")) + config.logger.Panic("invalid config", xlog.FieldExtMessage("socketTimeout")) } if config.PoolLimit == 0 { - _logger.Panic("invalid config", xlog.FieldExtMessage("poolLimit")) + config.logger.Panic("invalid config", xlog.FieldExtMessage("poolLimit")) } } diff --git a/pkg/store/mongox/option.go b/pkg/store/mongox/option.go index 3c52f5e870..ecc365a399 100644 --- a/pkg/store/mongox/option.go +++ b/pkg/store/mongox/option.go @@ -5,9 +5,12 @@ import ( "github.com/douyu/jupiter/pkg/conf" "github.com/douyu/jupiter/pkg/core/constant" + "github.com/douyu/jupiter/pkg/core/ecode" "github.com/douyu/jupiter/pkg/core/singleton" + "github.com/douyu/jupiter/pkg/xlog" "github.com/spf13/cast" "go.mongodb.org/mongo-driver/mongo" + "go.uber.org/zap" ) // Config ... @@ -20,6 +23,8 @@ type ( SocketTimeout time.Duration `json:"socketTimeout" toml:"socketTimeout"` // 连接池大小(最大连接数) PoolLimit int `json:"poolLimit" toml:"poolLimit"` + + logger *zap.Logger } ) @@ -43,6 +48,7 @@ func DefaultConfig() *Config { return &Config{ SocketTimeout: cast.ToDuration("5s"), PoolLimit: 100, + logger: xlog.Jupiter().Named(ecode.ModStoreMongo), } } From 12a4d8a8edbce1eecfb566e2132f74f846a8f737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Wed, 26 Oct 2022 15:46:05 +0800 Subject: [PATCH 5/7] fix data race --- pkg/client/rocketmq/init.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkg/client/rocketmq/init.go b/pkg/client/rocketmq/init.go index c2766ee512..7a427920f1 100644 --- a/pkg/client/rocketmq/init.go +++ b/pkg/client/rocketmq/init.go @@ -20,21 +20,18 @@ import ( "runtime" "github.com/apache/rocketmq-client-go/v2/primitive" - "github.com/douyu/jupiter/pkg/conf" "github.com/douyu/jupiter/pkg/core/ecode" "github.com/douyu/jupiter/pkg/xlog" "go.uber.org/zap" ) func init() { - conf.OnLoaded(func(c *conf.Configuration) { - logger := xlog.Jupiter().Named(ecode.ModeClientRocketMQ) + logger := xlog.Jupiter().Named(ecode.ModeClientRocketMQ) - primitive.PanicHandler = func(i interface{}) { - stack := make([]byte, 1024) - length := runtime.Stack(stack, true) - fmt.Fprint(os.Stderr, "[rocketmq panic recovery]\n", string(stack[:length])) - logger.Error("rocketmq panic recovery", zap.Any("error", i)) - } - }) + primitive.PanicHandler = func(i interface{}) { + stack := make([]byte, 1024) + length := runtime.Stack(stack, true) + fmt.Fprint(os.Stderr, "[rocketmq panic recovery]\n", string(stack[:length])) + logger.Error("rocketmq panic recovery", zap.Any("error", i)) + } } From c2f093913b7a518abddcc1bcf3ce7e252d16e65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Wed, 26 Oct 2022 15:47:06 +0800 Subject: [PATCH 6/7] fix it --- pkg/client/rocketmq/init.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/client/rocketmq/init.go b/pkg/client/rocketmq/init.go index 7a427920f1..6d94177687 100644 --- a/pkg/client/rocketmq/init.go +++ b/pkg/client/rocketmq/init.go @@ -26,12 +26,11 @@ import ( ) func init() { - logger := xlog.Jupiter().Named(ecode.ModeClientRocketMQ) primitive.PanicHandler = func(i interface{}) { stack := make([]byte, 1024) length := runtime.Stack(stack, true) fmt.Fprint(os.Stderr, "[rocketmq panic recovery]\n", string(stack[:length])) - logger.Error("rocketmq panic recovery", zap.Any("error", i)) + xlog.Jupiter().Named(ecode.ModeClientRocketMQ).Error("rocketmq panic recovery", zap.Any("error", i)) } } From 8b30a22cf34da2cbabb05c71306cac815fc401b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Wed, 26 Oct 2022 15:52:22 +0800 Subject: [PATCH 7/7] fix lint --- pkg/client/rocketmq/log.go | 102 ------------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 pkg/client/rocketmq/log.go diff --git a/pkg/client/rocketmq/log.go b/pkg/client/rocketmq/log.go deleted file mode 100644 index c80903ba76..0000000000 --- a/pkg/client/rocketmq/log.go +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2022 Douyu -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package rocketmq - -import ( - "go.uber.org/zap" -) - -type mqLogger struct { - logger *zap.Logger -} - -func (l *mqLogger) Debug(msg string, fields map[string]interface{}) { - if msg == "" && len(fields) == 0 { - return - } - - fs := make([]zap.Field, 0, len(fields)) - - for key, value := range fields { - fs = append(fs, zap.Any(key, value)) - } - - l.logger.Debug(msg, fs...) -} - -func (l *mqLogger) Info(msg string, fields map[string]interface{}) { - if msg == "" && len(fields) == 0 { - return - } - - fs := make([]zap.Field, 0, len(fields)) - - for key, value := range fields { - fs = append(fs, zap.Any(key, value)) - } - - // Here we reguard the info level as debug level - l.logger.Debug(msg, fs...) -} - -func (l *mqLogger) Warning(msg string, fields map[string]interface{}) { - if msg == "" && len(fields) == 0 { - return - } - - fs := make([]zap.Field, 0, len(fields)) - - for key, value := range fields { - fs = append(fs, zap.Any(key, value)) - } - - l.logger.Warn(msg, fs...) -} - -func (l *mqLogger) Error(msg string, fields map[string]interface{}) { - if msg == "" && len(fields) == 0 { - return - } - - fs := make([]zap.Field, 0, len(fields)) - - for key, value := range fields { - fs = append(fs, zap.Any(key, value)) - } - - l.logger.Error(msg, fs...) -} - -func (l *mqLogger) Fatal(msg string, fields map[string]interface{}) { - if msg == "" && len(fields) == 0 { - return - } - - fs := make([]zap.Field, 0, len(fields)) - - for key, value := range fields { - fs = append(fs, zap.Any(key, value)) - } - - l.logger.Fatal(msg, fs...) -} - -func (l *mqLogger) Level(level string) { - -} - -func (l *mqLogger) OutputPath(path string) (err error) { - return nil -}