diff --git a/go.mod b/go.mod index 0bcc656..4dc27cf 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/pelletier/go-toml/v2 v2.0.0-beta.3 - github.com/rs/zerolog v1.27.0 + github.com/rs/zerolog v1.28.0 github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 ) diff --git a/go.sum b/go.sum index 18461a6..55959bc 100644 --- a/go.sum +++ b/go.sum @@ -15,9 +15,9 @@ github.com/pelletier/go-toml/v2 v2.0.0-beta.3/go.mod h1:aNseLYu/uKskg0zpr/kbr2z8 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= -github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY= +github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 h1:t0lM6y/M5IiUZyvbBTcngso8SZEZICH7is9B6g/obVU= github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= diff --git a/internal/log/func.go b/internal/log/func.go index a2bfddb..f960464 100644 --- a/internal/log/func.go +++ b/internal/log/func.go @@ -1,8 +1,8 @@ package log import ( - "fmt" - "github.com/rs/zerolog" + "runtime/debug" + "strings" ) func Assert(condition bool, msg string) { @@ -12,19 +12,24 @@ func Assert(condition bool, msg string) { } func Debugf(format string, args ...interface{}) { - logFinally(logger.Debug(), format, args...) + logger.Debug().Msgf(format, args...) } func Infof(format string, args ...interface{}) { - logFinally(logger.Info(), format, args...) + logger.Info().Msgf(format, args...) } func Warnf(format string, args ...interface{}) { - logFinally(logger.Warn(), format, args...) + logger.Warn().Msgf(format, args...) } func Panicf(format string, args ...interface{}) { - logFinally(logger.Panic(), format, args...) + stack := string(debug.Stack()) + stack = strings.ReplaceAll(stack, "\n\t", "]<-") + stack = strings.ReplaceAll(stack, "\n", " [") + logger.Info().Msg(stack) + + logger.Panic().Msgf(format, args...) } func PanicError(err error) { @@ -36,43 +41,3 @@ func PanicIfError(err error) { PanicError(err) } } - -func logFinally(event *zerolog.Event, format string, args ...interface{}) { - str := fmt.Sprintf(format, args...) - //inxTrunct := -1 - //keyStart := -1 - //valueStart := -1 - //key := "" - //value := "" - //for inx, b := range str { - // switch b { - // case ' ': - // keyStart = inx + 1 - // case '=': - // if keyStart == -1 { - // continue - // } - // key = str[keyStart:inx] - // case '[': - // valueStart = inx + 1 - // case ']': - // if valueStart == -1 { - // continue - // } - // value = str[valueStart:inx] - // if key == "" || value == "" { - // continue - // } - // event = event.Str(key, value) - // if inxTrunct == -1 { - // inxTrunct = keyStart - 1 - // } - // keyStart = -1 - // valueStart = -1 - // } - //} - //if inxTrunct != -1 { - // str = str[:inxTrunct] - //} - event.Msg(str) -}