helper/error_helper.go

@@ -7,18 +7,8 @@
 
 package helper
 
-import "github.com/pkg/errors"
-
 func CheckErr(err error) {
 	if err != nil {
 		panic(err)
 	}
 }
-
-func Error(msg string) error {
-	return errors.New(msg)
-}
-
-func WrapErr(err error, msg string) error {
-	return errors.Wrap(err, msg)
-}

logger/access.go

@@ -43,6 +43,7 @@ func Access() *zerolog.Logger {
 			With().
 			Timestamp().
 			Stack().
+			CallerWithSkipFrameCount(2).
 			Logger()
 
 		access_log = &l

logger/console.go

@@ -43,6 +43,7 @@ func Console() *zerolog.Logger {
 			With().
 			Timestamp().
 			Stack().
+			CallerWithSkipFrameCount(2).
 			Logger()
 
 		console_log = &l

logger/init.go

@@ -8,7 +8,6 @@
 package logger
 
 import (
-	"path/filepath"
 	"strconv"
 	"time"
 
@@ -19,14 +18,10 @@ 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 filepath.Base(file) + ":" + strconv.Itoa(line)
+		return file + ":" + strconv.Itoa(line)
 	}
 }
 

logger/log.go

@@ -43,6 +43,7 @@ func Get() *zerolog.Logger {
 			With().
 			Timestamp().
 			Stack().
+			CallerWithSkipFrameCount(2).
 			Logger()
 		log = &l
 	})

logger/log_test.go

@@ -8,38 +8,17 @@
 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 := outer()
+	err := errors.New("test error")
-	log.Error().Err(err).Msg("hello world")
+	log.Log().Err(err).Msg("hello world")
-	log.Info().Msg("中华人民共和国")
 }

logger/recover.go

@@ -43,6 +43,7 @@ func Recover() *zerolog.Logger {
 			With().
 			Timestamp().
 			Stack().
+			CallerWithSkipFrameCount(2).
 			Logger()
 
 		recover_log = &l

logger/work.go

@@ -42,6 +42,7 @@ func Work() *zerolog.Logger {
 			With().
 			Timestamp().
 			Stack().
+			CallerWithSkipFrameCount(2).
 			Logger()
 
 		work_log = &l