From 6de048d84f039dd62cba5a9d109392492b2ab057 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 20:16:52 +0800 Subject: [PATCH] Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode # Conflicts: # pkg/common/mw/rpc_server_interceptor.go --- pkg/common/log/zap.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 6b809c351..1698d0582 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -47,10 +47,6 @@ func ZError(ctx context.Context, msg string, err error, keysAndValues ...interfa type ZapLogger struct { zap *zap.SugaredLogger - // store original logger without sampling to avoid multiple samplers - SampleDuration time.Duration - SampleInitial int - SampleInterval int } func NewZapLogger() (*ZapLogger, error) { @@ -61,10 +57,10 @@ func NewZapLogger() (*ZapLogger, error) { DisableStacktrace: true, InitialFields: map[string]interface{}{"PID": os.Getegid()}, } - zl := &ZapLogger{} if config.Config.Log.Stderr { zapConfig.OutputPaths = append(zapConfig.OutputPaths, "stderr") } + zl := &ZapLogger{} opts, err := zl.cores() if err != nil { return nil, err