diff --git a/logger/access.go b/logger/access.go index d97122e..9acdbf9 100644 --- a/logger/access.go +++ b/logger/access.go @@ -43,7 +43,6 @@ func Access() *zerolog.Logger { With(). Timestamp(). Stack(). - CallerWithSkipFrameCount(2). Logger() access_log = &l diff --git a/logger/console.go b/logger/console.go index cdcb4f8..6e699a2 100644 --- a/logger/console.go +++ b/logger/console.go @@ -43,7 +43,6 @@ func Console() *zerolog.Logger { With(). Timestamp(). Stack(). - CallerWithSkipFrameCount(2). Logger() console_log = &l diff --git a/logger/init.go b/logger/init.go index 2cc72f8..830c657 100644 --- a/logger/init.go +++ b/logger/init.go @@ -8,6 +8,7 @@ package logger import ( + "path/filepath" "strconv" "time" @@ -18,10 +19,14 @@ import ( var loggerLevel = zerolog.InfoLevel func init() { + // zerolog.ErrorStackMarshaler = func(err error) interface{} { + // return pkgerrors.MarshalStack(errors.Wrap(err, "wrap")) + // } zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack - zerolog.TimeFieldFormat = time.RFC3339Nano + + zerolog.TimeFieldFormat = time.RFC3339 zerolog.CallerMarshalFunc = func(pc uintptr, file string, line int) string { - return file + ":" + strconv.Itoa(line) + return filepath.Base(file) + ":" + strconv.Itoa(line) } } diff --git a/logger/log.go b/logger/log.go index 036da8f..d750e38 100644 --- a/logger/log.go +++ b/logger/log.go @@ -43,7 +43,6 @@ func Get() *zerolog.Logger { With(). Timestamp(). Stack(). - CallerWithSkipFrameCount(2). Logger() log = &l }) diff --git a/logger/log_test.go b/logger/log_test.go index 8fa05a9..b34e1b9 100644 --- a/logger/log_test.go +++ b/logger/log_test.go @@ -8,17 +8,38 @@ package logger_test import ( - "errors" "testing" "git.hexq.cn/tiglog/golib/gtest" "git.hexq.cn/tiglog/golib/logger" + "github.com/pkg/errors" ) +func inner() error { + return errors.New("seems we have an error here") +} + +func middle() error { + err := inner() + if err != nil { + return err + } + return nil +} + +func outer() error { + err := middle() + if err != nil { + return err + } + return nil +} + func TestLogToFile(t *testing.T) { // logger.SetupLog("./var/log/test.log", zerolog.DebugLevel) var log = logger.Get() gtest.NotNil(t, log) - err := errors.New("test error") - log.Log().Err(err).Msg("hello world") + err := outer() + log.Error().Err(err).Msg("hello world") + log.Info().Msg("中华人民共和国") } diff --git a/logger/recover.go b/logger/recover.go index d82cba8..a3127bb 100644 --- a/logger/recover.go +++ b/logger/recover.go @@ -43,7 +43,6 @@ func Recover() *zerolog.Logger { With(). Timestamp(). Stack(). - CallerWithSkipFrameCount(2). Logger() recover_log = &l diff --git a/logger/work.go b/logger/work.go index ef6a8b7..6804372 100644 --- a/logger/work.go +++ b/logger/work.go @@ -42,7 +42,6 @@ func Work() *zerolog.Logger { With(). Timestamp(). Stack(). - CallerWithSkipFrameCount(2). Logger() work_log = &l