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{},