mirror of https://github.com/milvus-io/milvus.git
Remove globalZapWrapper in logutil.go (#15726)
issue: #15720 Signed-off-by: sunby <bingyi.sun@zilliz.com> Co-authored-by: sunby <bingyi.sun@zilliz.com>pull/15649/head
parent
e1bfd14db1
commit
d6857f4b24
|
@ -19,7 +19,6 @@ package logutil
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
|
||||||
|
|
||||||
"github.com/milvus-io/milvus/internal/log"
|
"github.com/milvus-io/milvus/internal/log"
|
||||||
|
|
||||||
|
@ -105,17 +104,6 @@ func LogPanic() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var once sync.Once
|
var once sync.Once
|
||||||
var _globalZapWrapper atomic.Value
|
|
||||||
|
|
||||||
const defaultLogLevel = "info"
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
conf := &log.Config{Level: defaultLogLevel, File: log.FileLogConfig{}}
|
|
||||||
lg, _, _ := log.InitLogger(conf)
|
|
||||||
_globalZapWrapper.Store(&zapWrapper{
|
|
||||||
logger: lg,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetupLogger is used to initialize the log with config.
|
// SetupLogger is used to initialize the log with config.
|
||||||
func SetupLogger(cfg *log.Config) {
|
func SetupLogger(cfg *log.Config) {
|
||||||
|
@ -129,24 +117,11 @@ func SetupLogger(cfg *log.Config) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// initialize grpc and etcd logger
|
// initialize grpc and etcd logger
|
||||||
c := *cfg
|
wrapper := &zapWrapper{logger}
|
||||||
c.Level = defaultLogLevel
|
|
||||||
lg, _, err := log.InitLogger(&c)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("initialize grpc/etcd logger error", zap.Error(err))
|
|
||||||
}
|
|
||||||
|
|
||||||
wrapper := &zapWrapper{lg}
|
|
||||||
grpclog.SetLoggerV2(wrapper)
|
grpclog.SetLoggerV2(wrapper)
|
||||||
_globalZapWrapper.Store(wrapper)
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetZapWrapper returns the stored zapWrapper object.
|
|
||||||
func GetZapWrapper() *zapWrapper {
|
|
||||||
return _globalZapWrapper.Load().(*zapWrapper)
|
|
||||||
}
|
|
||||||
|
|
||||||
type logKey int
|
type logKey int
|
||||||
|
|
||||||
const logCtxKey logKey = iota
|
const logCtxKey logKey = iota
|
||||||
|
|
Loading…
Reference in New Issue