diff --git a/pkg/adapter/logs/log.go b/pkg/adapter/logs/log.go index 6a7045fd..185b2a47 100644 --- a/pkg/adapter/logs/log.go +++ b/pkg/adapter/logs/log.go @@ -86,9 +86,6 @@ type Logger interface { Flush() } -var adapters = make(map[string]newLoggerFunc) -var levelPrefix = [LevelDebug + 1]string{"[M]", "[A]", "[C]", "[E]", "[W]", "[N]", "[I]", "[D]"} - // Register makes a log provide available by the provided name. // If Register is called twice with the same name or if driver is nil, // it panics. @@ -344,3 +341,7 @@ func Debug(f interface{}, v ...interface{}) { func Trace(f interface{}, v ...interface{}) { logs.Trace(f, v...) } + +func init() { + SetLogFuncCallDepth(4) +} diff --git a/pkg/core/logs/log.go b/pkg/core/logs/log.go index cec8d51d..b05abd3b 100644 --- a/pkg/core/logs/log.go +++ b/pkg/core/logs/log.go @@ -142,7 +142,7 @@ var logMsgPool *sync.Pool func NewLogger(channelLens ...int64) *BeeLogger { bl := new(BeeLogger) bl.level = LevelDebug - bl.loggerFuncCallDepth = 2 + bl.loggerFuncCallDepth = 3 bl.msgChanLen = append(channelLens, 0)[0] if bl.msgChanLen <= 0 { bl.msgChanLen = defaultAsyncMsgLen diff --git a/scripts/adapter.sh b/scripts/adapter.sh new file mode 100644 index 00000000..ce2d319a --- /dev/null +++ b/scripts/adapter.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# using pkg/adapter. Usually you want to migrate to V2 smoothly, you could running this script + +find ./ -name '*.go' -type f -exec sed -i '' -e 's/github.com\/astaxie\/beego/github.com\/astaxie\/beego\/pkg\/adapter/g' {} \; +find ./ -name '*.go' -type f -exec sed -i '' -e 's/"github.com\/astaxie\/beego\/pkg\/adapter"/beego "github.com\/astaxie\/beego\/pkg\/adapter"/g' {} \;