BlackForestBytes/goext
20
0
Fork 0
Code Actions

v0.0.253
Some checks failed
Build Docker and Deploy / Run goext test-suite (push) Failing after 1m23s
Details

Browse Source
This commit is contained in:
Mike Schwörer 2023-08-22 10:36:35 +02:00
parent 6d3bd13f61
commit 9e5bc0d3ea
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
exerr/exerr.go
View File

@ -4,7 +4,10 @@ import (
"github.com/rs/xid" "github.com/rs/xid"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"gogs.mikescher.com/BlackForestBytes/goext/langext" "gogs.mikescher.com/BlackForestBytes/goext/langext"
"gogs.mikescher.com/BlackForestBytes/goext/rext"
"reflect" "reflect"
"regexp"
"strconv"
"strings" "strings"
"time" "time"
) )
@ -77,7 +80,10 @@ func (ee *ExErr) As(target any) bool {
} }
func (ee *ExErr) Log(evt *zerolog.Event) { func (ee *ExErr) Log(evt *zerolog.Event) {
backup := zerolog.CallerMarshalFunc
zerolog.CallerMarshalFunc = customZerologCallerMarshalFunc
evt.Msg(ee.FormatLog(LogPrintFull)) evt.Msg(ee.FormatLog(LogPrintFull))
zerolog.CallerMarshalFunc = backup
} }
func (ee *ExErr) FormatLog(lvl LogPrintLevel) string { func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
@ -164,7 +170,10 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
} }
func (ee *ExErr) ShortLog(evt *zerolog.Event) { func (ee *ExErr) ShortLog(evt *zerolog.Event) {
backup := zerolog.CallerMarshalFunc
zerolog.CallerMarshalFunc = customZerologCallerMarshalFunc
ee.Meta.Apply(evt).Msg(ee.FormatLog(LogPrintShort)) ee.Meta.Apply(evt).Msg(ee.FormatLog(LogPrintShort))
zerolog.CallerMarshalFunc = backup
} }
// RecursiveMessage returns the message to show // RecursiveMessage returns the message to show
@ -296,3 +305,10 @@ func (ee *ExErr) equalsDirectProperties(other *ExErr) bool {
func newID() string { func newID() string {
return xid.New().String() return xid.New().String()
} }
var regexZerologCallerClean = rext.W(regexp.MustCompile(`^(\.\./)*/?go/pkg/mod/gogs\.(mikescher|blackforestbytes)\.(com|de)/!black!forest!bytes/?`))
func customZerologCallerMarshalFunc(pc uintptr, file string, line int) string {
file = regexZerologCallerClean.ReplaceAll(file, "", true)
return file + ":" + strconv.Itoa(line)
}

2
ginext/response.go
View File

@ -207,7 +207,7 @@ func Error(e error) HTTPResponse {
func ErrWrap(e error, errorType exerr.ErrorType, msg string) HTTPResponse { func ErrWrap(e error, errorType exerr.ErrorType, msg string) HTTPResponse {
return &jsonAPIErrResponse{ return &jsonAPIErrResponse{
err: exerr.FromError(exerr.Wrap(e, msg).WithStackSkip(3).WithType(errorType).Build()), err: exerr.FromError(exerr.Wrap(e, msg).WithType(errorType).Build()),
} }
} }

4
goextVersion.go
View File

@ -1,5 +1,5 @@
package goext package goext
const GoextVersion = "0.0.252" const GoextVersion = "0.0.253"
const GoextVersionTimestamp = "2023-08-22T10:23:04+0200" const GoextVersionTimestamp = "2023-08-22T10:36:35+0200"